diff --git a/resources/qml/Preferences/MachinesPage.qml b/resources/qml/Preferences/MachinesPage.qml
index 258b45292e..4984087883 100644
--- a/resources/qml/Preferences/MachinesPage.qml
+++ b/resources/qml/Preferences/MachinesPage.qml
@@ -93,6 +93,13 @@ UM.ManagementPage
             maximumWidth: minimumWidth * 3
             maximumHeight: minimumHeight * 3
             backgroundColor: UM.Theme.getColor("main_background")
+            onVisibleChanged:
+            {
+                if(!visible)
+                {
+                    actionDialog.loader.item.focus = true
+                }
+            }
         }
 
         UM.ConfirmRemoveDialog