diff --git a/src/components/betaflight-logo/BetaflightLogo.vue b/src/components/betaflight-logo/BetaflightLogo.vue
index 6c8bcb8e..d66ff1b1 100644
--- a/src/components/betaflight-logo/BetaflightLogo.vue
+++ b/src/components/betaflight-logo/BetaflightLogo.vue
@@ -18,6 +18,8 @@
   opacity: 0.5;
   font-size: 10px;
   min-width: 210px;
+  display: flex;
+  flex-direction: column;
 }
 
 .tab_container .logo {
@@ -73,15 +75,13 @@
     <div class="logo_text">
       <span>
         {{ $t("versionLabelConfigurator") }}: {{ configuratorVersion }}
-        <br />
-        <span v-if="firmwareVersion && firmwareId">
-          {{ $t("versionLabelFirmware") }}: {{ firmwareVersion }}
-          {{ firmwareId }}
-        </span>
-        <br />
-        <span v-if="hardwareId">
-          {{ $t("versionLabelTarget") }}: {{ hardwareId }}
-        </span>
+      </span>
+      <span v-if="firmwareVersion && firmwareId">
+        {{ $t("versionLabelFirmware") }}: {{ firmwareVersion }}
+        {{ firmwareId }}
+      </span>
+      <span class="hardwareId" v-if="hardwareId">
+        {{ $t("versionLabelTarget") }}: {{ hardwareId }}
       </span>
     </div>
   </div>
diff --git a/src/js/port_handler.js b/src/js/port_handler.js
index 73affb26..3dbb6527 100644
--- a/src/js/port_handler.js
+++ b/src/js/port_handler.js
@@ -90,9 +90,6 @@ PortHandler.check_usb_devices = function (callback) {
             callback(self.dfu_available);
         }
         if (!$('option:selected', self.portPickerElement).data().isDFU) {
-            if (!GUI.connected_to) {
-                FC.resetState();
-            }
             self.portPickerElement.trigger('change');
         }
     });
diff --git a/src/js/protocols/stm32usbdfu.js b/src/js/protocols/stm32usbdfu.js
index 2e2dc922..b8c1983c 100644
--- a/src/js/protocols/stm32usbdfu.js
+++ b/src/js/protocols/stm32usbdfu.js
@@ -775,6 +775,7 @@ STM32DFU_protocol.prototype.upload_procedure = function (step) {
                     for (var j = 0; j < self.flash_layout.sectors[i].num_pages; j++) {
                         if (self.options.erase_chip) {
                             // full chip erase
+                            FC.resetState();
                             erase_pages.push({'sector': i, 'page': j});
                         } else {
                             // local erase
@@ -1074,6 +1075,8 @@ STM32DFU_protocol.prototype.leave = function () {
 STM32DFU_protocol.prototype.cleanup = function () {
     const self = this;
 
+    FC.resetState();
+
     self.releaseInterface(0);
 
     GUI.connect_lock = false;