diff --git a/src/modules/hyprland/workspaces.cpp b/src/modules/hyprland/workspaces.cpp
index 7ad87bab54..12a9f9d9f3 100644
--- a/src/modules/hyprland/workspaces.cpp
+++ b/src/modules/hyprland/workspaces.cpp
@@ -51,8 +51,8 @@ Workspaces::Workspaces(const std::string &id, const Bar &bar, const Json::Value
     gIPC = std::make_unique<IPC>();
   }
 
-  init();
   registerIpc();
+  init();
 }
 
 auto Workspaces::parseConfig(const Json::Value &config) -> void {
@@ -180,7 +180,10 @@ auto Workspaces::update() -> void {
     }
   }
 
+  auto clients_data = gIPC->getSocket1JsonReply("clients");
   for (auto &workspace : m_workspaces) {
+    workspace->initializeWindowMap(clients_data);
+
     // active
     workspace->setActive(workspace->name() == m_activeWorkspaceName);
     // disable urgency if workspace is active