diff --git a/Source/Core/DolphinQt/Config/ControllersWindow.cpp b/Source/Core/DolphinQt/Config/ControllersWindow.cpp
index fb5813bdc1..3eeec77e0f 100644
--- a/Source/Core/DolphinQt/Config/ControllersWindow.cpp
+++ b/Source/Core/DolphinQt/Config/ControllersWindow.cpp
@@ -426,7 +426,10 @@ void ControllersWindow::OnGCPadConfigure()
     return;
   }
 
-  MappingWindow(this, type, static_cast<int>(index)).exec();
+  MappingWindow* window = new MappingWindow(this, type, static_cast<int>(index));
+  window->setAttribute(Qt::WA_DeleteOnClose, true);
+  window->setWindowModality(Qt::WindowModality::WindowModal);
+  window->show();
 }
 
 void ControllersWindow::OnWiimoteConfigure()
@@ -451,7 +454,10 @@ void ControllersWindow::OnWiimoteConfigure()
     return;
   }
 
-  MappingWindow(this, type, static_cast<int>(index)).exec();
+  MappingWindow* window = new MappingWindow(this, type, static_cast<int>(index));
+  window->setAttribute(Qt::WA_DeleteOnClose, true);
+  window->setWindowModality(Qt::WindowModality::WindowModal);
+  window->show();
 }
 
 void ControllersWindow::LoadSettings()