diff --git a/wizard/WizardMain.qml b/wizard/WizardMain.qml
index 6b25be1d..eeefbf17 100644
--- a/wizard/WizardMain.qml
+++ b/wizard/WizardMain.qml
@@ -65,6 +65,8 @@ Rectangle {
     }
 
     function handlePageChanged() {
+        var nextButtonVisible = pages[currentPage] !== optionsPage;
+        nextButton.visible = nextButtonVisible;
         switch (pages[currentPage]) {
         case passwordPage:
             // disable "next" button until passwords match
@@ -85,8 +87,7 @@ Rectangle {
             // nextButton.enabled = false;
             break
         default:
-            var nextButtonVisible = pages[currentPage] !== optionsPage;
-            //nextButton.visible = nextButton.enabled = nextButtonVisible;
+
         }
 
     }