diff --git a/src/js/port_handler.js b/src/js/port_handler.js
index ba02a46b..838ff177 100644
--- a/src/js/port_handler.js
+++ b/src/js/port_handler.js
@@ -166,6 +166,10 @@ PortHandler.check_usb_devices = function (callback) {
         }
 
         if(callback) callback(self.dfu_available);
+
+        if (!$('option:selected', portPickerElement).data().isDFU) {
+            portPickerElement.trigger('change');
+        }
     });
 };
 
diff --git a/src/js/tabs/firmware_flasher.js b/src/js/tabs/firmware_flasher.js
index badad967..ea2f232e 100644
--- a/src/js/tabs/firmware_flasher.js
+++ b/src/js/tabs/firmware_flasher.js
@@ -981,7 +981,7 @@ TABS.firmware_flasher.initialize = function (callback) {
 
         portPickerElement.change(function () {
             if ($('option:selected', this).data().isDFU) {
-               exitDfuElement.removeClass('disabled');
+                exitDfuElement.removeClass('disabled');
             } else {
                 exitDfuElement.addClass('disabled');
             }
@@ -1054,6 +1054,7 @@ TABS.firmware_flasher.initialize = function (callback) {
         }
 
         function startFlashing() {
+            exitDfuElement.addClass('disabled');
             if (!GUI.connect_lock) { // button disabled while flashing is in progress
                 if (self.parsed_hex) {
                     try {