diff --git a/front/src/components/Queue.vue b/front/src/components/Queue.vue
index 1f35df1d8..12850155c 100644
--- a/front/src/components/Queue.vue
+++ b/front/src/components/Queue.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { useStore } from '~/store'
-import { nextTick, onMounted, ref, computed } from 'vue'
+import { nextTick, onMounted, ref, computed, onBeforeMount, onUnmounted } from 'vue'
 import { useRouter } from 'vue-router'
 import time from '~/utils/time'
 import { useFocusTrap } from '@vueuse/integrations/useFocusTrap'
@@ -14,6 +14,14 @@ import usePlayer from '~/composables/audio/usePlayer'
 
 const queueModal = ref()
 
+let savedScroll = 0
+onBeforeMount(() => (savedScroll = window.scrollY))
+onUnmounted(() => {
+  document.body.parentElement?.setAttribute('style', 'scroll-behavior: auto')
+  window.scrollTo({ top: savedScroll, behavior: undefined })
+  document.body.parentElement?.removeAttribute('style')
+})
+
 const { activate } = useFocusTrap(queueModal, { allowOutsideClick: true })
 activate()
 
diff --git a/front/src/style/components/_player.scss b/front/src/style/components/_player.scss
index e85f9b149..edd1fe1e1 100644
--- a/front/src/style/components/_player.scss
+++ b/front/src/style/components/_player.scss
@@ -213,6 +213,7 @@
     align-items: center;
     justify-content: space-between;
     min-width: 10em;
+    z-index: 2;
     > .control.button {
       padding: 0.5em;