diff --git a/src/js/serial_backend.js b/src/js/serial_backend.js
index 50a6ed3e..ec6b065c 100644
--- a/src/js/serial_backend.js
+++ b/src/js/serial_backend.js
@@ -90,15 +90,11 @@ function initializeSerialBackend() {
         if ($('div#flashbutton a.flash_state').hasClass('active') && $('div#flashbutton a.flash').hasClass('active')) {
             $('div#flashbutton a.flash_state').removeClass('active');
             $('div#flashbutton a.flash').removeClass('active');
-            document.getElementById("tab_landing").style.display = "block";
-            document.getElementById("tab_help").style.display = "block";
             $('#tabs ul.mode-disconnected .tab_landing a').click();
         } else {
             $('#tabs ul.mode-disconnected .tab_firmware_flasher a').click();
             $('div#flashbutton a.flash_state').addClass('active');
             $('div#flashbutton a.flash').addClass('active');
-            document.getElementById("tab_landing").style.display = "none";
-            document.getElementById("tab_help").style.display = "none";
         }
     });
 
diff --git a/src/js/tabs/firmware_flasher.js b/src/js/tabs/firmware_flasher.js
index cc5b3b0b..70ee6f32 100644
--- a/src/js/tabs/firmware_flasher.js
+++ b/src/js/tabs/firmware_flasher.js
@@ -680,6 +680,9 @@ TABS.firmware_flasher.initialize = function (callback) {
             }
         });
 
+        // Update Firmware button at top
+        $('div#flashbutton a.flash_state').addClass('active');
+        $('div#flashbutton a.flash').addClass('active');
         GUI.content_ready(callback);
     }
 
@@ -696,6 +699,10 @@ TABS.firmware_flasher.cleanup = function (callback) {
     $(document).unbind('keypress');
     $(document).off('click', 'span.progressLabel a');
 
+    // Update Firmware button at top
+    $('div#flashbutton a.flash_state').removeClass('active');
+    $('div#flashbutton a.flash').removeClass('active');
+
     analytics.resetFirmwareData();
 
     if (callback) callback();