diff --git a/UI/Debugger/Workspace/DebugWorkspaceManager.cs b/UI/Debugger/Workspace/DebugWorkspaceManager.cs
index 3743b1b..48c1abb 100644
--- a/UI/Debugger/Workspace/DebugWorkspaceManager.cs
+++ b/UI/Debugger/Workspace/DebugWorkspaceManager.cs
@@ -83,10 +83,11 @@ namespace Mesen.GUI.Debugger.Workspace
 		public static DebugWorkspace GetWorkspace()
 		{
 			string romName = EmuApi.GetRomInfo().GetRomName();
+			if(_workspace != null) {
+				SaveWorkspace();
+			}
+
 			if(_workspace == null || _romName != romName) {
-				if(_workspace != null) {
-					SaveWorkspace();
-				}
 				_romName = romName;
 				_workspace = DebugWorkspace.GetWorkspace();