diff --git a/tabs/initial_setup.js b/tabs/initial_setup.js
index 5e8482c25f..575bb17b88 100644
--- a/tabs/initial_setup.js
+++ b/tabs/initial_setup.js
@@ -164,9 +164,10 @@ TABS.initial_setup.initialize = function (callback) {
 
                 function reboot() {
                     GUI.log(chrome.i18n.getMessage('initialSetupEepromSaved'));
-                    GUI.tab_switch_cleanup();
 
-                    MSP.send_message(MSP_codes.MSP_SET_REBOOT, false, false, reinitialize);
+                    GUI.tab_switch_cleanup(function() {
+                        MSP.send_message(MSP_codes.MSP_SET_REBOOT, false, false, reinitialize);
+                    });
                 }
 
                 function reinitialize() {