diff --git a/tabs/default.js b/tabs/default.js
index 61dc045b73..dd7c6e0dda 100644
--- a/tabs/default.js
+++ b/tabs/default.js
@@ -15,7 +15,9 @@ tabs.default.initialize = function(callback) {
         $('div.changelog.configurator .wrapper').load('./changelog.html');
 
         // UI Hooks
-        $('a.firmware_flasher').click(tab_initialize_firmware_flasher);
+        $('a.firmware_flasher').click(function() {
+            tabs.firmware_flasher.initialize();
+        });
 
         $('div.welcome a').click(function() {
             ga_tracker.sendEvent('ExternalUrls', 'Click', $(this).prop('href'));
diff --git a/tabs/firmware_flasher.js b/tabs/firmware_flasher.js
index 01411bd5bb..6889de9987 100644
--- a/tabs/firmware_flasher.js
+++ b/tabs/firmware_flasher.js
@@ -1,4 +1,7 @@
-function tab_initialize_firmware_flasher(callback) {
+tabs.firmware_flasher = function() {
+};
+
+tabs.firmware_flasher.initialize = function(callback) {
     ga_tracker.sendAppView('Firmware Flasher');
     GUI.active_tab = 'firmware_flasher';
 
@@ -228,8 +231,14 @@ function tab_initialize_firmware_flasher(callback) {
                 GUI.log(chrome.i18n.getMessage('firmwareFlasherWaitForFinish'));
             }
         });
+
+        if (callback) callback();
     });
-}
+};
+
+tabs.firmware_flasher.cleanup = function(callback) {
+    if (callback) callback();
+};
 
 function parse_hex(str, callback) {
     // parsing hex in different thread