diff --git a/src/gui/start_wizard.cpp b/src/gui/start_wizard.cpp
index 292bcc9f1..991835987 100644
--- a/src/gui/start_wizard.cpp
+++ b/src/gui/start_wizard.cpp
@@ -99,12 +99,6 @@ int CStartUpWizard::exec(CMenuTarget* parent, const string & /*actionKey*/)
 			res = CNetworkSetup::getInstance()->exec(NULL, "");
 			CNetworkSetup::getInstance()->setWizardMode(CNetworkSetup::N_SETUP_MODE_WIZARD_NO);
 		}
-		if(res != menu_return::RETURN_EXIT_ALL) 
-		{
-			CScanSetup::getInstance()->setWizardMode(CScanSetup::SCAN_SETUP_MODE_WIZARD);
-			res = CScanSetup::getInstance()->exec(NULL, "");
-			CScanSetup::getInstance()->setWizardMode(CScanSetup::SCAN_SETUP_MODE_WIZARD_NO);
-		}
 		bool init_settings = false;
 		if (g_info.delivery_system == DVB_S)
 			init_settings = file_exists("/var/tuxbox/config/initial/");
@@ -119,9 +113,13 @@ int CStartUpWizard::exec(CMenuTarget* parent, const string & /*actionKey*/)
 				CZapit::getInstance()->PrepareChannels();
 			}
 		}
+		if(res != menu_return::RETURN_EXIT_ALL) 
+		{
+			CScanSetup::getInstance()->setWizardMode(CScanSetup::SCAN_SETUP_MODE_WIZARD);
+			res = CScanSetup::getInstance()->exec(NULL, "");
+			CScanSetup::getInstance()->setWizardMode(CScanSetup::SCAN_SETUP_MODE_WIZARD_NO);
+		}
 	}
-
-	
 	
 	killBackgroundLogo();
 	return res;