diff --git a/src/DynamoCore/Models/DynamoModel.cs b/src/DynamoCore/Models/DynamoModel.cs
index edd70103af3..4661789b0cb 100644
--- a/src/DynamoCore/Models/DynamoModel.cs
+++ b/src/DynamoCore/Models/DynamoModel.cs
@@ -325,9 +325,8 @@ public WorkspaceModel CurrentWorkspace
             set
             {
                 if (Equals(value, currentWorkspace)) return;
-                var old = currentWorkspace;
+                OnWorkspaceHidden(currentWorkspace);
                 currentWorkspace = value;
-                OnWorkspaceHidden(old);
                 OnPropertyChanged(nameof(CurrentWorkspace));
             }
         }