diff --git a/front/src/App.vue b/front/src/App.vue
index 1d3d514f5..6cc415436 100644
--- a/front/src/App.vue
+++ b/front/src/App.vue
@@ -100,13 +100,13 @@ store.dispatch('auth/fetchUser')
           </Suspense>
         </KeepAlive>
       </Transition>
+      <transition name="queue">
+        <Queue v-show="store.state.ui.queueFocused" />
+      </transition>
     </RouterView>
   </div>
-  <ServiceMessages />
-  <transition name="queue">
-    <Queue v-show="store.state.ui.queueFocused" />
-  </transition>
   <AudioPlayer class="funkwhale" v-bind="color({}, ['default', 'solid'])()" />
+  <ServiceMessages />
   <LanguagesModal />
   <ShortcutsModal />
   <PlaylistModal v-if="store.state.auth.authenticated" />
diff --git a/front/src/style/components/_queue.scss b/front/src/style/components/_queue.scss
index 109a7fc7c..468a93f83 100644
--- a/front/src/style/components/_queue.scss
+++ b/front/src/style/components/_queue.scss
@@ -42,7 +42,7 @@
     position: fixed;
     min-height: 100vh;
     width: 100vw;
-    z-index: 10000;
+    z-index: 1000;
   }
   &.main > .button {
     position: fixed;