diff --git a/src/ui/window.vala b/src/ui/window.vala
index a187846..b8b6e38 100644
--- a/src/ui/window.vala
+++ b/src/ui/window.vala
@@ -88,7 +88,7 @@ class Ui.Window : Adw.ApplicationWindow {
                     }
                     this.shuffle_all_tracks.sensitive = true;
 
-                    this.playbin.begin_playback (0);
+                    this.play_queue_model.select_item (0, true);
                 });
             });
         });
@@ -189,12 +189,12 @@ class Ui.Window : Adw.ApplicationWindow {
     }
 
     [GtkCallback] private void on_skip_forward_clicked () {
-        this.playbin.begin_playback (this.playbin.playing_index+1);
+        this.play_queue_model.select_item (this.playbin.playing_index+1, true);
     }
 
     [GtkCallback] private void on_skip_backward_clicked () {
         if (this.playbin.playing_index > 0) {
-            this.playbin.begin_playback (this.playbin.playing_index-1);
+            this.play_queue_model.select_item (this.playbin.playing_index-1, true);
         }
     }