diff --git a/src/modules/hyprland/workspaces.cpp b/src/modules/hyprland/workspaces.cpp
index 5f4b86c3dc..f16122d62a 100644
--- a/src/modules/hyprland/workspaces.cpp
+++ b/src/modules/hyprland/workspaces.cpp
@@ -331,22 +331,26 @@ void Workspaces::onWorkspaceCreated(std::string const &workspaceName,
     auto const workspaceRules = gIPC->getSocket1JsonReply("workspacerules");
     for (Json::Value workspaceJson : workspacesJson) {
       std::string name = workspaceJson["name"].asString();
-      if (name == workspaceName &&
-          (allOutputs() || m_bar.output->name == workspaceJson["monitor"].asString()) &&
-          (showSpecial() || !name.starts_with("special")) && !isDoubleSpecial(workspaceName)) {
-        for (Json::Value const &rule : workspaceRules) {
-          if (rule["workspaceString"].asString() == workspaceName) {
-            workspaceJson["persistent"] = rule["persistent"].asBool();
-            break;
+      if (name == workspaceName) {
+        if ((allOutputs() || m_bar.output->name == workspaceJson["monitor"].asString()) &&
+            (showSpecial() || !name.starts_with("special")) && !isDoubleSpecial(workspaceName)) {
+          for (Json::Value const &rule : workspaceRules) {
+            if (rule["workspaceString"].asString() == workspaceName) {
+              workspaceJson["persistent"] = rule["persistent"].asBool();
+              break;
+            }
           }
-        }
 
-        m_workspacesToCreate.emplace_back(workspaceJson, clientsData);
+          m_workspacesToCreate.emplace_back(workspaceJson, clientsData);
+          break;
+        }
+      } else {
+        extendOrphans(workspaceJson["id"].asInt(), clientsData);
         break;
       }
     }
   } else {
-    spdlog::debug("Not creating workspace because it is ignored: {}", workspaceName);
+    spdlog::trace("Not creating workspace because it is ignored: {}", workspaceName);
   }
 }
 
@@ -734,6 +738,8 @@ void Workspaces::initializeWorkspaces() {
         (!workspaceName.starts_with("special") || showSpecial()) &&
         !isWorkspaceIgnored(workspaceName)) {
       m_workspacesToCreate.emplace_back(workspaceJson, clientsJson);
+    } else {
+      extendOrphans(workspaceJson["id"].asInt(), clientsJson);
     }
   }
 
@@ -747,6 +753,15 @@ void Workspaces::initializeWorkspaces() {
   }
 }
 
+void Workspaces::extendOrphans(int workspaceId, Json::Value const &clientsJson) {
+  spdlog::trace("Extending orphans with workspace {}", workspaceId);
+  for (const auto &client : clientsJson) {
+    if (client["workspace"]["id"].asInt() == workspaceId) {
+      registerOrphanWindow({client});
+    }
+  }
+}
+
 void Workspaces::init() {
   m_activeWorkspaceName = (gIPC->getSocket1JsonReply("activeworkspace"))["name"].asString();