diff --git a/waybar-nedm-workspaces.py b/waybar-nedm-workspaces.py
index be9c060..81bca6a 100755
--- a/waybar-nedm-workspaces.py
+++ b/waybar-nedm-workspaces.py
@@ -176,8 +176,8 @@ class NEDMWorkspaceTracker:
         
         if event_name == 'switch_ws':
             self.current_workspace = event.get('new_workspace', 1)  # Already 1-based
-            # Clear window title when switching workspaces since we don't know the focused window
-            self.current_window_title = ""
+            # Query current state to get the focused window on the new workspace
+            self.query_current_state()
         elif event_name == 'focus_tile':
             workspace = event.get('new_workspace')  # Use new_workspace for focus_tile events
             if workspace is not None: