diff --git a/src/main/java/com/sparrowwallet/sparrow/preferences/ServerPreferencesController.java b/src/main/java/com/sparrowwallet/sparrow/preferences/ServerPreferencesController.java
index 2bd0863a..3104f664 100644
--- a/src/main/java/com/sparrowwallet/sparrow/preferences/ServerPreferencesController.java
+++ b/src/main/java/com/sparrowwallet/sparrow/preferences/ServerPreferencesController.java
@@ -252,7 +252,6 @@ public class ServerPreferencesController extends PreferencesDetailController {
         });
 
         boolean isConnected = AppServices.isConnecting() || AppServices.isConnected();
-        setFieldsEditable(!isConnected);
 
         if(AppServices.isConnecting()) {
             testResults.appendText("Connecting to server, please wait...");
@@ -354,6 +353,8 @@ public class ServerPreferencesController extends PreferencesDetailController {
                 proxyPort.setText(Integer.toString(server.getPort()));
             }
         }
+
+        setFieldsEditable(!isConnected);
     }
 
     private void startElectrumConnection() {