diff --git a/cozy/app_controller.py b/cozy/app_controller.py
index 003f53db..b504eb2d 100644
--- a/cozy/app_controller.py
+++ b/cozy/app_controller.py
@@ -76,7 +76,7 @@ def __init__(self, gtk_app, main_window_builder, main_window):
         self.library_view_model.add_listener(self._on_open_view)
         self.library_view_model.add_listener(self._on_library_view_event)
         self.playback_control_view_model.add_listener(self._on_open_view)
-        self.headerbar_view_model.add_listener(self._on_open_view)
+        self.headerbar_view_model.add_listener(self._on_working_event)
         self.app_view_model.add_listener(self._on_app_view_event)
 
         self.main_window.add_listener(self._on_main_window_event)
@@ -148,10 +148,12 @@ def _on_app_view_event(self, event: str, data):
         if event == "view":
             self.headerbar_view_model.set_view(data)
 
-    def _on_main_window_event(self, event: str, data):
+    def _on_working_event(self, event: str, data) -> None:
         if event == "working":
             self.book_detail_view_model.lock_ui = data
             self.settings_view_model.lock_ui = data
+
+    def _on_main_window_event(self, event: str, data):
         if event == "open_view":
             self._on_open_view(data, None)
 
diff --git a/cozy/ui/main_view.py b/cozy/ui/main_view.py
index 39801517..2fdf606e 100644
--- a/cozy/ui/main_view.py
+++ b/cozy/ui/main_view.py
@@ -249,9 +249,9 @@ def switch_to_playing(self):
             self.block_ui_buttons(False, True)
         else:
             # we want to only block the player controls
+            # TODO: rework. this is messy
             self.block_ui_buttons(False, True)
             self.block_ui_buttons(True, False)
-        self.emit_event_main_thread("working", False)
 
     def check_for_tracks(self):
         """
diff --git a/cozy/view_model/headerbar_view_model.py b/cozy/view_model/headerbar_view_model.py
index dc20d622..9b5e2223 100644
--- a/cozy/view_model/headerbar_view_model.py
+++ b/cozy/view_model/headerbar_view_model.py
@@ -63,10 +63,12 @@ def _start_working(self, message: str):
         self._notify("work_message")
         self._notify("work_progress")
         self._notify("state")
+        self.emit_event_main_thread("working", True)
 
     def _stop_working(self):
         self._state = HeaderBarState.PLAYING
         self._notify("state")
+        self.emit_event_main_thread("working", False)
 
     def _on_importer_event(self, event: str, message):
         if event == "scan-progress" and isinstance(message, float):