diff --git a/resources/qml/WizardPages/AddMachine.qml b/resources/qml/WizardPages/AddMachine.qml
index 3c548fdfa6..d435e7a08f 100644
--- a/resources/qml/WizardPages/AddMachine.qml
+++ b/resources/qml/WizardPages/AddMachine.qml
@@ -7,8 +7,6 @@ import QtQuick.Window 2.1
 import QtQuick.Controls.Styles 1.1
 
 import UM 1.1 as UM
-import Cura 1.0 as Cura
-import ".."
 
 Item
 {
@@ -80,7 +78,6 @@ Item
                     base.wizard.removePage(i)
                 }
                 saveMachine()
-                base.wizard.visible = false
             }
         }
         onBackClicked:
@@ -296,6 +293,9 @@ Item
                         break;
                 }
             }
+            if(base.wizard.lastPage ==  true){
+                base.wizard.visible = false
+            }
         }
     }