diff --git a/src/qt/qt_joystickconfiguration.cpp b/src/qt/qt_joystickconfiguration.cpp
index e5d70a68e..54aec5c6d 100644
--- a/src/qt/qt_joystickconfiguration.cpp
+++ b/src/qt/qt_joystickconfiguration.cpp
@@ -82,7 +82,9 @@ int JoystickConfiguration::selectedPov(int pov) {
 void JoystickConfiguration::on_comboBoxDevice_currentIndexChanged(int index) {
     for (auto w : widgets) {
         ui->ct->removeWidget(w);
+        w->deleteLater();
     }
+    widgets.clear();
 
     if (index == 0) {
         return;