diff --git a/Source/Core/DolphinQt/Host.cpp b/Source/Core/DolphinQt/Host.cpp
index 5e73896d7a..c4d3711eda 100644
--- a/Source/Core/DolphinQt/Host.cpp
+++ b/Source/Core/DolphinQt/Host.cpp
@@ -19,6 +19,8 @@
 #include "DolphinQt/QtUtils/QueueOnObject.h"
 #include "DolphinQt/Settings.h"
 
+#include "InputCommon/ControllerInterface/ControllerInterface.h"
+
 #include "VideoCommon/RenderBase.h"
 #include "VideoCommon/VideoConfig.h"
 
@@ -37,7 +39,11 @@ void Host::SetRenderHandle(void* handle)
 
   m_render_handle = handle;
   if (g_renderer)
+  {
     g_renderer->ChangeSurface(handle);
+    if (g_controller_interface.IsInit())
+      g_controller_interface.ChangeWindow(handle);
+  }
 }
 
 bool Host::GetRenderFocus()