diff --git a/src/components/RightSideBar/Queue.vue b/src/components/RightSideBar/Queue.vue
index dccce504..ab8252b6 100644
--- a/src/components/RightSideBar/Queue.vue
+++ b/src/components/RightSideBar/Queue.vue
@@ -10,14 +10,14 @@
     <div class="inner" v-bind="wrapperProps">
       <TrackItem
         style="height: 64px"
-        v-for="(t, index) in tracks"
+        v-for="t in tracks"
         :key="t.index"
         :track="t.data"
-        :index="index"
+        :index="t.index"
         :isPlaying="queue.playing"
         :isCurrent="t.index === queue.currentindex"
         :isQueueTrack="true"
-        @PlayThis="playFromQueue(index)"
+        @PlayThis="playFromQueue(t.index)"
       />
     </div>
   </div>
@@ -49,7 +49,6 @@ const {
   scrollTo,
 } = useVirtualList(source, {
   itemHeight: 64,
-  overscan: 10,
 });
 
 onMounted(() => {
diff --git a/src/stores/queue.ts b/src/stores/queue.ts
index c495e038..95b273e9 100644
--- a/src/stores/queue.ts
+++ b/src/stores/queue.ts
@@ -1,6 +1,6 @@
+import { focusElem } from "@/utils";
 import { paths } from "@/config";
 import { defineStore } from "pinia";
-import state from "../composables/state";
 import { NotifType, useNotifStore } from "./notification";
 
 import { FromOptions } from "../composables/enums";