diff --git a/resources/qml/Preferences/MachinesPage.qml b/resources/qml/Preferences/MachinesPage.qml
index e51fce09f0..b1a5d7f19b 100644
--- a/resources/qml/Preferences/MachinesPage.qml
+++ b/resources/qml/Preferences/MachinesPage.qml
@@ -125,7 +125,7 @@ UM.ManagementPage
             }
         }
 
-        UM.RenameDialog
+        Cura.RenameDialog
         {
             id: renameDialog
             object: base.currentItem && base.currentItem.name ? base.currentItem.name : ""
diff --git a/resources/qml/Preferences/RenameDialog.qml b/resources/qml/Preferences/RenameDialog.qml
index 7bf02e92a1..6e4c628114 100644
--- a/resources/qml/Preferences/RenameDialog.qml
+++ b/resources/qml/Preferences/RenameDialog.qml
@@ -11,6 +11,9 @@ import Cura 1.0 as Cura
 UM.Dialog
 {
     id: base
+
+    buttonSpacing: UM.Theme.getSize("default_margin").width
+
     property string object: ""
 
     property alias newName: nameField.text
@@ -64,14 +67,6 @@ UM.Dialog
         }
     }
 
-    Item
-    {
-        ButtonGroup {
-            buttons: [cancelButton, okButton]
-            checkedButton: okButton
-        }
-    }
-
     rightButtons: [
         Cura.SecondaryButton
         {