diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml
index 38019de8e2..604f8e0b92 100644
--- a/resources/qml/Cura.qml
+++ b/resources/qml/Cura.qml
@@ -506,6 +506,17 @@ UM.MainWindow
         onTriggered: preferences.getCurrentItem().showProfileNameDialog()
     }
 
+    // BlurSettings is a way to force the focus away from any of the setting items.
+    // We need to do this in order to keep the bindings intact.
+    Connections
+    {
+        target: Cura.MachineManager
+        onBlurSettings:
+        {
+            contentItem.focus = true
+        }
+    }
+
     // Workaround for shortcuts not working for singletons.
     // The main window eats all the events, so we need to pass them manually.
     Action
diff --git a/resources/qml/Settings/SettingItem.qml b/resources/qml/Settings/SettingItem.qml
index 69272764c9..a7bdabb3c5 100644
--- a/resources/qml/Settings/SettingItem.qml
+++ b/resources/qml/Settings/SettingItem.qml
@@ -248,14 +248,5 @@ Item {
         }
     }
 
-    Connections
-    {
-        target: Cura.MachineManager
-        onBlurSettings:
-        {
-            revertButton.focus = true
-        }
-    }
-
     UM.I18nCatalog { id: catalog; name: "cura" }
 }