diff --git a/wobuzz/gui.py b/wobuzz/gui.py
index 51d2036..c0ebf62 100644
--- a/wobuzz/gui.py
+++ b/wobuzz/gui.py
@@ -55,6 +55,7 @@ class GUI:
         self.settings.update_all()
 
     def on_exit(self, event):
+        self.app.player.stop()
         self.app.library.on_exit(event)
 
         self.app.settings.window_size = (self.window.width(), self.window.height())
diff --git a/wobuzz/ui/track_control.py b/wobuzz/ui/track_control.py
index f96d345..2aa1068 100644
--- a/wobuzz/ui/track_control.py
+++ b/wobuzz/ui/track_control.py
@@ -42,17 +42,13 @@ class TrackControl(QToolBar):
     def connect(self):
         self.previous_button.triggered.connect(self.previous_track)
         self.toggle_play_button.triggered.connect(self.toggle_playing)
-        self.stop_button.triggered.connect(self.stop)
+        self.stop_button.triggered.connect(self.app.player.stop)
         self.next_button.triggered.connect(self.next_track)
 
     def previous_track(self):
         if self.app.player.current_playlist is not None and self.app.player.current_playlist.has_tracks():
             self.app.player.previous_track()
 
-    def stop(self):
-        if self.app.player.current_playlist is not None and self.app.player.current_playlist.has_tracks():
-            self.app.player.stop()
-
     def next_track(self):
         if self.app.player.current_playlist is not None and self.app.player.current_playlist.has_tracks():
             self.app.player.next_track()