diff --git a/source/ubinstall-gtk.c b/source/ubinstall-gtk.c
index 4b27e00..2731c73 100644
--- a/source/ubinstall-gtk.c
+++ b/source/ubinstall-gtk.c
@@ -1147,6 +1147,14 @@ void *on_setup_system_configuration(void * data){
         free(command);
         if (parameter_string) free(parameter_string);
     }
+    if (main_config.install_complete){
+        gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_COMPLETION);   
+    } else {
+        printf("still deactivated\n");
+        gtk_widget_set_sensitive(widgets->CancelInstallButton,0);
+        gtk_widget_set_sensitive(widgets->NextButton,0);
+        gtk_widget_set_sensitive(widgets->BackButton,0);
+    }
     return NULL;
 }
 
@@ -1190,6 +1198,10 @@ void *on_save_system_configuration(void * data){
         free(command);
         if (parameter_string) free(parameter_string);
     }
+        printf("still deactivated\n");
+        gtk_widget_set_sensitive(widgets->CancelInstallButton,0);
+        gtk_widget_set_sensitive(widgets->NextButton,0);
+        gtk_widget_set_sensitive(widgets->BackButton,0);
     return NULL;
 }
 
@@ -1680,14 +1692,7 @@ void on_page_navigation_clicked(GtkWidget *self, main_window *widgets){
                             yon_debug_output("Save changed to: %s\n",yon_char_from_int(main_config.save_done));
 
                             yon_debug_output("Install state: %s\n",yon_char_from_int(main_config.install_complete));
-                        if (main_config.install_complete){
-                            gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_COMPLETION);
-                        } else {
-                            printf("still deactivated\n");
-                            gtk_widget_set_sensitive(widgets->CancelInstallButton,0);
-                            gtk_widget_set_sensitive(widgets->NextButton,0);
-                            gtk_widget_set_sensitive(widgets->BackButton,0);
-                        }
+                        
                     } else {
                         gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_CONFIGURE_END);
                     }