diff --git a/lib/libimhex/source/api/workspace_manager.cpp b/lib/libimhex/source/api/workspace_manager.cpp
index d276c13e2..b259aef1c 100644
--- a/lib/libimhex/source/api/workspace_manager.cpp
+++ b/lib/libimhex/source/api/workspace_manager.cpp
@@ -14,10 +14,10 @@
 
 namespace hex {
 
-    AutoReset<std::map<std::string, WorkspaceManager::Workspace>> s_workspaces;
-    decltype(s_workspaces)::Type::iterator s_currentWorkspace  = s_workspaces->end();
-    decltype(s_workspaces)::Type::iterator s_previousWorkspace = s_workspaces->end();
-    decltype(s_workspaces)::Type::iterator s_workspaceToRemove = s_workspaces->end();
+    static AutoReset<std::map<std::string, WorkspaceManager::Workspace>> s_workspaces;
+    static decltype(s_workspaces)::Type::iterator s_currentWorkspace  = s_workspaces->end();
+    static decltype(s_workspaces)::Type::iterator s_previousWorkspace = s_workspaces->end();
+    static decltype(s_workspaces)::Type::iterator s_workspaceToRemove = s_workspaces->end();
 
     void WorkspaceManager::createWorkspace(const std::string& name, const std::string &layout) {
         s_currentWorkspace = s_workspaces->insert_or_assign(name, Workspace {