diff --git a/src/components/nav/NavBar.vue b/src/components/nav/NavBar.vue
index 18659e5d..5d3ecbb4 100644
--- a/src/components/nav/NavBar.vue
+++ b/src/components/nav/NavBar.vue
@@ -4,9 +4,6 @@
       <NavButtons />
 
       <div
-        :style="{
-          overflowY: hideOverflow() ? 'visible' : 'hidden',
-        }"
         class="info"
       >
         <APTitle
@@ -20,10 +17,6 @@
         <QueueTitle v-if="$route.name == Routes.queue" />
       </div>
     </div>
-    <!-- 
-    <div class="center rounded">
-      <Loader />
-    </div> -->
   </div>
 </template>
 
@@ -39,7 +32,6 @@ import { Routes } from "@/composables/enums";
 import NavButtons from "./NavButtons.vue";
 
 import FolderTitle from "./Titles/Folder.vue";
-import SimpleTitle from "./Titles/SimpleTitle.vue";
 import APTitle from "./Titles/APTitle.vue";
 import SearchTitle from "./Titles/SearchTitle.vue";
 import PlaylistsTitle from "./Titles/PlaylistsTitle.vue";
@@ -51,12 +43,6 @@ const nav = useNavStore();
 
 const subPaths = ref<subPath[]>([]);
 
-function hideOverflow() {
-  const { name } = route;
-  const { album, playlist, search, folder } = Routes;
-
-  return (album + playlist + search + folder).includes(name as string);
-}
 
 watch(
   () => route.name,
diff --git a/src/components/nav/Titles/QueueTitle.vue b/src/components/nav/Titles/QueueTitle.vue
index 7152e15c..c504073c 100644
--- a/src/components/nav/Titles/QueueTitle.vue
+++ b/src/components/nav/Titles/QueueTitle.vue
@@ -6,7 +6,7 @@
       </router-link>
       <div class="playing-from">
         <div class="border rounded-sm pad-sm">
-          <source-icon />
+          <SourceIcon v-if="SourceIcon" />
           <b class="ellip">{{ name }}</b>
         </div>
       </div>
diff --git a/src/stores/queue.ts b/src/stores/queue.ts
index 2e04201f..98783d56 100644
--- a/src/stores/queue.ts
+++ b/src/stores/queue.ts
@@ -204,15 +204,27 @@ export default defineStore("Queue", {
         return;
       }
 
-      const shuffled = shuffle(this.tracklist);
-      this.tracklist = shuffled;
+      const current = this.currenttrack;
+      const current_hash = current.hash;
 
-      this.currentindex = 0;
-      this.currentid = shuffled[0].trackid;
+      this.tracklist = shuffle(this.tracklist);
+      // find current track after shuffle
 
       if (this.playing) {
-        this.play(this.currentindex);
+        const newindex = this.tracklist.findIndex(
+          (track) => track.hash === current_hash
+        );
+
+        // remove current track from queue
+        this.tracklist.splice(newindex, 1);
+        // insert current track at beginning of queue
+        this.tracklist.unshift(current);
+        this.currentindex = 0;
+        return;
       }
+
+      this.currentindex = 0;
+      this.play(this.currentindex);
     },
     removeFromQueue(index: number = 0) {
       this.tracklist.splice(index, 1);