diff --git a/src/main/java/sbu/javafx/MusicController.java b/src/main/java/sbu/javafx/MusicController.java
index 65006b5..030fa60 100644
--- a/src/main/java/sbu/javafx/MusicController.java
+++ b/src/main/java/sbu/javafx/MusicController.java
@@ -57,6 +57,7 @@ public class MusicController {
         int currentIndex = musicListView.getSelectionModel().getSelectedIndex();
         if (currentIndex > 0) {
             musicListView.getSelectionModel().select(currentIndex - 1);
+            isPlaying = false;
             handlePlayAction();
         }
     }
@@ -66,6 +67,7 @@ public class MusicController {
         int currentIndex = musicListView.getSelectionModel().getSelectedIndex();
         if (currentIndex < musicListView.getItems().size() - 1) {
             musicListView.getSelectionModel().select(currentIndex + 1);
+            isPlaying = false;
             handlePlayAction();
         }
     }