diff --git a/cockatrice/src/dlg_connect.cpp b/cockatrice/src/dlg_connect.cpp
index 8f676a77..a5982689 100644
--- a/cockatrice/src/dlg_connect.cpp
+++ b/cockatrice/src/dlg_connect.cpp
@@ -206,6 +206,10 @@ void DlgConnect::rebuildComboBoxList(int failure)
         }
     }
 
+    // Disable auto connect when updating
+    settingsCache->servers().setAutoConnect(false);
+
+    // Re-enable the refresh server button
     btnRefreshServers->setDisabled(false);
 }