diff --git a/changes/changelog.d/807.enhancement b/changes/changelog.d/807.enhancement
new file mode 100644
index 000000000..bab8f9647
--- /dev/null
+++ b/changes/changelog.d/807.enhancement
@@ -0,0 +1 @@
+Clicking on the currently selected playlist in the Playlist popup will now close the popup (#807)
\ No newline at end of file
diff --git a/front/src/components/playlists/PlaylistModal.vue b/front/src/components/playlists/PlaylistModal.vue
index 44969afbf..97c5f0a1e 100644
--- a/front/src/components/playlists/PlaylistModal.vue
+++ b/front/src/components/playlists/PlaylistModal.vue
@@ -57,7 +57,7 @@
                   :to="{name: 'library.playlists.detail', params: {id: playlist.id }, query: {mode: 'edit'}}"><i class="ui pencil icon"></i></router-link>
               </td>
               <td :title="playlist.name">
-                <router-link :to="{name: 'library.playlists.detail', params: {id: playlist.id }}">{{ playlist.name }}</router-link></td>
+                <router-link v-on:click.native="update(false)" :to="{name: 'library.playlists.detail', params: {id: playlist.id }}">{{ playlist.name }}</router-link></td>
               <td><human-date :date="playlist.modification_date"></human-date></td>
               <td>{{ playlist.tracks_count }}</td>
               <td>