1 files changed, 10 insertions, 0 deletions
diff --git a/Source/Core/DolphinQt2/MainWindow.cpp b/Source/Core/DolphinQt2/MainWindow.cpp
index d60c0ac415..c003f5be04 100644
--- a/Source/Core/DolphinQt2/MainWindow.cpp
+++ b/Source/Core/DolphinQt2/MainWindow.cpp
@@ -52,6 +52,7 @@ MainWindow::MainWindow() : QMainWindow(nullptr)
 MainWindow::~MainWindow()
 {
   m_render_widget->deleteLater();
+  ShutdownControllers();
 }
 
 void MainWindow::InitControllers()
@@ -66,6 +67,15 @@ void MainWindow::InitControllers()
   HotkeyManagerEmu::Initialize();
 }
 
+void MainWindow::ShutdownControllers()
+{
+  g_controller_interface.Shutdown();
+  Pad::Shutdown();
+  Keyboard::Shutdown();
+  Wiimote::Shutdown();
+  HotkeyManagerEmu::Shutdown();
+}
+
 void MainWindow::CreateComponents()
 {
   m_menu_bar = new MenuBar(this);