diff --git a/app/src/processing/app/debug/AvrdudeUploader.java b/app/src/processing/app/debug/AvrdudeUploader.java
index e0f06711c..5b9eef572 100755
--- a/app/src/processing/app/debug/AvrdudeUploader.java
+++ b/app/src/processing/app/debug/AvrdudeUploader.java
@@ -98,6 +98,12 @@ public class AvrdudeUploader extends Uploader  {
           Serial.touchPort(uploadPort, 1200);
         }
 
+        // On Linux, scanning for available ports seems to open the port
+        // or otherwise assert DTR, which would cancel the WDT reset if
+        // it happened within 250 ms.  So we wait until the reset should
+        // have already occured before we start scanning.
+        if (Base.isLinux()) Thread.sleep(300);
+
         // Wait for a port to appear on the list
         int elapsed = 0;
         while (elapsed < 10000) {