diff --git a/src/assets/css/global.scss b/src/assets/css/global.scss
index eded3d6a..66873038 100644
--- a/src/assets/css/global.scss
+++ b/src/assets/css/global.scss
@@ -98,7 +98,7 @@ a {
 .l-sidebar {
   width: 17rem;
   grid-area: l-sidebar;
-  background-color: $gray;
+  background-color: $black;
   margin: $small;
   padding: 1rem;
 }
diff --git a/src/components/RightSideBar/Queue.vue b/src/components/RightSideBar/Queue.vue
index 2f290808..fba38453 100644
--- a/src/components/RightSideBar/Queue.vue
+++ b/src/components/RightSideBar/Queue.vue
@@ -2,12 +2,16 @@
   <div class="up-next">
     <div class="r-grid">
       <UpNext :next="queue.next" :playNext="queue.playNext" />
-      <div class="scrollable-r border rounded">
+      <div
+        class="scrollable-r border rounded"
+        @mouseenter="setMouseOver(true)"
+        @mouseleave="setMouseOver(false)"
+      >
         <TrackItem
           v-for="t in queue.tracks"
           :key="t.trackid"
           :track="t"
-          @playThis="playThis"
+          @playThis="queue.play(t)"
           :isCurrent="t.trackid === queue.current.trackid"
           :isPlaying="queue.playing"
         />
@@ -20,15 +24,23 @@
 <script setup lang="ts">
 import TrackItem from "../shared/TrackItem.vue";
 import useQStore from "../../stores/queue";
-import { Track } from "../../interfaces.js";
 import PlayingFrom from "./queue/playingFrom.vue";
 import UpNext from "./queue/upNext.vue";
+import { onUpdated, ref } from "vue";
+import { focusElem } from "@/composables/perks";
 
 const queue = useQStore();
+const mouseover = ref(false);
 
-function playThis(track: Track) {
-  queue.play(track);
+function setMouseOver(val: boolean) {
+  mouseover.value = val;
 }
+
+onUpdated(() => {
+  if (mouseover.value) return;
+
+  focusElem("currentInQueue");
+});
 </script>
 
 <style lang="scss">
diff --git a/src/composables/perks.ts b/src/composables/perks.ts
index abd8c26a..6aa8fa7c 100644
--- a/src/composables/perks.ts
+++ b/src/composables/perks.ts
@@ -14,7 +14,6 @@ const putCommas = (artists: string[]) => {
 
 function focusElem(className: string, delay?: number) {
   const dom = document.getElementsByClassName(className)[0];
-  if (!delay) delay = 300;
 
   setTimeout(() => {
     if (dom) {
@@ -24,7 +23,7 @@ function focusElem(className: string, delay?: number) {
         inline: "center",
       });
     }
-  }, delay);
+  }, delay | 300);
 }
 
 function getElem(id: string, type: string) {
diff --git a/src/stores/queue.ts b/src/stores/queue.ts
index 061b9c81..f1bc6428 100644
--- a/src/stores/queue.ts
+++ b/src/stores/queue.ts
@@ -66,13 +66,13 @@ export default defineStore("Queue", {
       this.updateCurrent(track);
 
       new Promise((resolve, reject) => {
+        this.audio.autoplay = true;
         this.audio.src = uri;
         this.audio.oncanplaythrough = resolve;
         this.audio.onerror = reject;
       })
         .then(() => {
           this.track.duration = this.audio.duration;
-
           this.audio.play().then(() => {
             this.playing = true;
             notif(track, this.playPause, this.playNext, this.playPrev);