diff --git a/src/platform/qt/OverrideView.cpp b/src/platform/qt/OverrideView.cpp
index 20ddbb70f..6366b97de 100644
--- a/src/platform/qt/OverrideView.cpp
+++ b/src/platform/qt/OverrideView.cpp
@@ -143,6 +143,7 @@ void OverrideView::gameStopped() {
 	m_ui.hwTilt->setEnabled(!m_ui.hwAutodetect->isChecked());
 	m_ui.hwRumble->setEnabled(!m_ui.hwAutodetect->isChecked());
 
+	m_ui.hwAutodetect->setChecked(true);
 	m_ui.hwRTC->setChecked(false);
 	m_ui.hwGyro->setChecked(false);
 	m_ui.hwLight->setChecked(false);
@@ -150,7 +151,7 @@ void OverrideView::gameStopped() {
 	m_ui.hwRumble->setChecked(false);
 
 	m_ui.idleLoop->setEnabled(true);
+	m_ui.idleLoop->clear();
 
-	m_ui.clear->setEnabled(false);
 	m_ui.save->setEnabled(false);
 }
diff --git a/src/platform/qt/OverrideView.ui b/src/platform/qt/OverrideView.ui
index b00f2415d..5f45887df 100644
--- a/src/platform/qt/OverrideView.ui
+++ b/src/platform/qt/OverrideView.ui
@@ -35,16 +35,6 @@
        </property>
       </spacer>
      </item>
-     <item>
-      <widget class="QPushButton" name="clear">
-       <property name="enabled">
-        <bool>false</bool>
-       </property>
-       <property name="text">
-        <string>Clear</string>
-       </property>
-      </widget>
-     </item>
      <item>
       <widget class="QPushButton" name="save">
        <property name="enabled">