diff --git a/front/src/components/Queue.vue b/front/src/components/Queue.vue
index 59971c21e..5b85b2880 100644
--- a/front/src/components/Queue.vue
+++ b/front/src/components/Queue.vue
@@ -15,10 +15,10 @@
                       {{ currentTrack.title }}
                     </router-link>
                     <div class="sub header ellipsis">
-                      <router-link class="discrete link artist" :to="{name: 'library.artists.detail', params: {id: currentTrack.artist.id }}">
-                        {{ currentTrack.artist.name }}</router-link> <template v-if="currentTrack.album">/<router-link class="discrete link album" :to="{name: 'library.albums.detail', params: {id: currentTrack.album.id }}">
-                        {{ currentTrack.album.title }}
-                      </router-link></template>
+                      <router-link class="discrete link artist" :to="{name: 'library.artists.detail', params: {id: currentTrack.artist.id }}">{{ currentTrack.artist.name }}</router-link>
+                      <template v-if="currentTrack.album"> /
+                        <router-link class="discrete link album" :to="{name: 'library.albums.detail', params: {id: currentTrack.album.id }}">{{ currentTrack.album.title }}</router-link>
+                      </template>
                     </div>
                   </div>
                 </h1>
@@ -128,7 +128,12 @@
               <h2 class="ui header">
                 <div class="content">
                   <button
-                    class="ui right floated basic icon button"
+                    class="ui right floated basic button"
+                    @click="$store.commit('ui/queueFocused', null)">
+                      <translate translate-context="*/Queue/*/Verb">Close</translate>
+                  </button>
+                  <button
+                    class="ui right floated basic button danger"
                     @click="$store.dispatch('queue/clean')">
                       <translate translate-context="*/Queue/*/Verb">Clear</translate>
                   </button>
diff --git a/front/src/components/audio/Player.vue b/front/src/components/audio/Player.vue
index 8b9c13d17..e8bbb8dd8 100644
--- a/front/src/components/audio/Player.vue
+++ b/front/src/components/audio/Player.vue
@@ -24,10 +24,10 @@
               </router-link>
             </strong>
             <div class="meta">
-              <router-link @click.stop.prevent="" class="discrete link" :to="{name: 'library.artists.detail', params: {id: currentTrack.artist.id }}">
-                {{ currentTrack.artist.name }}</router-link><template v-if="currentTrack.album"> /<router-link @click.stop.prevent="" class="discrete link" :to="{name: 'library.albums.detail', params: {id: currentTrack.album.id }}">
-                {{ currentTrack.album.title }}
-              </router-link></template>
+              <router-link @click.stop.prevent="" class="discrete link" :to="{name: 'library.artists.detail', params: {id: currentTrack.artist.id }}">{{ currentTrack.artist.name }}</router-link>
+              <template v-if="currentTrack.album"> /
+                <router-link @click.stop.prevent="" class="discrete link" :to="{name: 'library.albums.detail', params: {id: currentTrack.album.id }}">{{ currentTrack.album.title }}</router-link>
+              </template>
             </div>
           </div>
         </div>