2 files changed, 5 insertions, 4 deletions

diff --git a/src/daemon.rs b/src/daemon.rs
index cca9b11..00bf35f 100644
--- a/src/daemon.rs
+++ b/src/daemon.rs
@@ -453,11 +453,10 @@ fn process_command(
                                         q.add_track(file.clone());
                                     }
                                     if !audio.is_playing()
-                                        && let Some(track) = files.first()
+                                        && let Some(track) = q.current()
                                     {
-                                        let track = Track::from_path(track.clone());
                                         audio.play(track.path.clone());
-                                        notification::notify_track(&track);
+                                        notification::notify_track(track);
                                     }
                                     format!("Queued {} tracks from: {}\n", files.len(), path_str)
                                 }
diff --git a/src/queue.rs b/src/queue.rs
index 53b104f..dca8e3d 100644
--- a/src/queue.rs
+++ b/src/queue.rs
@@ -171,7 +171,9 @@ impl Queue {
         if let ShuffleMode::All = self.shuffle {
             let mut rng = rand::rng();
             let pos = self.position.min(len.saturating_sub(1));
-            if pos + 1 < len {
+            if pos == 0 && len > 1 {
+                self.shuffled_indices.shuffle(&mut rng);
+            } else if pos + 1 < len {
                 self.shuffled_indices[pos + 1..].shuffle(&mut rng);
             }
         }