diff --git a/src/js/serial_backend.js b/src/js/serial_backend.js
index e11106fb..4d797fbe 100644
--- a/src/js/serial_backend.js
+++ b/src/js/serial_backend.js
@@ -36,6 +36,7 @@ let liveDataRefreshTimerId = false;
 let isConnected = false;
 
 const REBOOT_CONNECT_MAX_TIME_MS = 10000;
+const REBOOT_GRACE_PERIOD_MS = 2000;
 let rebootTimestamp = 0;
 
 const toggleStatus = function () {
@@ -109,6 +110,12 @@ function connectDisconnect() {
                 return;
             }
 
+            // When rebooting, adhere to the auto-connect setting
+            if (!PortHandler.portPicker.autoConnect && Date.now() - rebootTimestamp < REBOOT_GRACE_PERIOD_MS) {
+                console.log(`${logHead} Rebooting, not connecting`);
+                return;
+            }
+
             console.log(`${logHead} Connecting to: ${portName}`);
             GUI.connecting_to = portName;