diff --git a/src/comms.cpp b/src/comms.cpp
index 392a2c8..3c4bfa8 100644
--- a/src/comms.cpp
+++ b/src/comms.cpp
@@ -571,7 +571,6 @@ void tryWiFi() {
       Udp.begin(9031);
       remoteip = IPAddress (WiFi.localIP()[0], WiFi.localIP()[1], WiFi.localIP()[2], subnetclient);
       if (!setupmode) tftPrint(0, myLanguage[language][57], 155, 128, InsignificantColor, InsignificantColorSmooth, 28);
-      wifi = true;
     } else {
       if (!setupmode) tftPrint(0, myLanguage[language][56], 155, 128, SignificantColor, SignificantColorSmooth, 28);
       Server.end();
diff --git a/src/gui.cpp b/src/gui.cpp
index 37d183b..9ecafe6 100644
--- a/src/gui.cpp
+++ b/src/gui.cpp
@@ -2244,6 +2244,7 @@ void DoMenu() {
               XDRGTK_key = XDRGTK_key_input.getValue();
               EEPROM.writeString(EE_STRING_XDRGTK_KEY, XDRGTK_key);
               EEPROM.commit();
+			  wifi = true;
               tryWiFi();
               delay(2000);
               menuopen = false;