diff --git a/CMakeLists.txt b/CMakeLists.txt
index 043e3a35d2..e638c47aab 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1989,7 +1989,6 @@ set(GPU_SOURCES
 	GPU/Debugger/State.h
 	GPU/Debugger/Stepping.cpp
 	GPU/Debugger/Stepping.h
-	GPU/Debugger/Watch.h
 	GPU/ge_constants.h
 	GPU/GeConstants.cpp
 	GPU/GPUDefinitions.h
@@ -2075,6 +2074,7 @@ add_library(${CoreLibName} ${CoreLinkType}
 	Core/Debugger/MemBlockInfo.h
 	Core/Debugger/SymbolMap.cpp
 	Core/Debugger/SymbolMap.h
+	Core/Debugger/Watch.h
 	Core/Debugger/DisassemblyManager.cpp
 	Core/Debugger/DisassemblyManager.h
 	Core/Debugger/WebSocket.cpp
diff --git a/UI/ImDebugger/ImDebugger.cpp b/UI/ImDebugger/ImDebugger.cpp
index 46a96fce2f..7720281559 100644
--- a/UI/ImDebugger/ImDebugger.cpp
+++ b/UI/ImDebugger/ImDebugger.cpp
@@ -2159,7 +2159,7 @@ void ImDebugger::Frame(MIPSDebugInterface *mipsDebug, GPUDebugInterface *gpuDebu
 					System_CopyStringToClipboard(StringFromFormat("%016llx", (uint64_t)(uintptr_t)Memory::base));
 				}
 			}
-			ImGui::Separator();
+			ImGui::Separator(); 
 			if (ImGui::MenuItem("Close")) {
 				g_Config.bShowImDebugger = false;
 			}
@@ -2175,6 +2175,7 @@ void ImDebugger::Frame(MIPSDebugInterface *mipsDebug, GPUDebugInterface *gpuDebu
 			ImGui::MenuItem("GPR regs", nullptr, &cfg_.gprOpen);
 			ImGui::MenuItem("FPR regs", nullptr, &cfg_.fprOpen);
 			ImGui::MenuItem("VFPU regs", nullptr, &cfg_.vfpuOpen);
+			ImGui::Separator();
 			ImGui::MenuItem("Callstacks", nullptr, &cfg_.callstackOpen);
 			ImGui::MenuItem("Breakpoints", nullptr, &cfg_.breakpointsOpen);
 			ImGui::MenuItem("Watch", nullptr, &cfg_.watchOpen);