diff --git a/Source/Core/DolphinWX/FrameAui.cpp b/Source/Core/DolphinWX/FrameAui.cpp
index 238fce6c4b..e5ea077a28 100644
--- a/Source/Core/DolphinWX/FrameAui.cpp
+++ b/Source/Core/DolphinWX/FrameAui.cpp
@@ -297,9 +297,11 @@ void CFrame::DoFloatNotebookPage(wxWindowID Id)
     wxAuiNotebook* nb = GetNotebookFromId(i);
     if (nb->GetPageIndex(Win) != wxNOT_FOUND)
     {
-      nb->RemovePage(nb->GetPageIndex(Win));
+      // Set the selected tab manually so the window is drawn before reparenting the window
+      nb->SetSelection(nb->GetPageIndex(Win));
       // Create the parent frame and reparent the window
       CreateParentFrame(Win->GetId() + IDM_LOG_WINDOW_PARENT - IDM_LOG_WINDOW, Win->GetName(), Win);
+      nb->RemovePage(nb->GetPageIndex(Win));
       if (nb->GetPageCount() == 0)
         AddRemoveBlankPage();
     }
diff --git a/Source/Core/DolphinWX/Globals.h b/Source/Core/DolphinWX/Globals.h
index 5779334918..9b95f5a3e0 100644
--- a/Source/Core/DolphinWX/Globals.h
+++ b/Source/Core/DolphinWX/Globals.h
@@ -188,6 +188,7 @@ enum
   IDM_LOG_WINDOW_PARENT,
   IDM_LOG_CONFIG_WINDOW_PARENT,
   IDM_REGISTER_WINDOW_PARENT,
+  IDM_WATCH_WINDOW_PARENT,
   IDM_BREAKPOINT_WINDOW_PARENT,
   IDM_MEMORY_WINDOW_PARENT,
   IDM_JIT_WINDOW_PARENT,
@@ -199,6 +200,7 @@ enum
   IDM_FLOAT_LOG_WINDOW,
   IDM_FLOAT_LOG_CONFIG_WINDOW,
   IDM_FLOAT_REGISTER_WINDOW,
+  IDM_FLOAT_WATCH_WINDOW,
   IDM_FLOAT_BREAKPOINT_WINDOW,
   IDM_FLOAT_MEMORY_WINDOW,
   IDM_FLOAT_JIT_WINDOW,