diff --git a/src/modules/wifi/clients.cpp b/src/modules/wifi/clients.cpp
index 63ef5ff4a..588f69f08 100644
--- a/src/modules/wifi/clients.cpp
+++ b/src/modules/wifi/clients.cpp
@@ -1056,6 +1056,21 @@ void telnetWorkerTask(void *pvParameters) {
 
 void runSessionUiLoop(const String &title) {
     resetCommandBufferToPrompt();
+    resetClientScreen(title.c_str());
+
+    displayTextLine("Connecting...");
+    while (isSessionConnecting() && !isSessionClosed() && !returnToMenu) {
+        if (check(EscPress)) {
+            finishSessionUi(title);
+            return;
+        }
+        vTaskDelay(pdMS_TO_TICKS(50));
+    }
+    if (returnToMenu || isSessionClosed()) {
+        finishSessionUi(title);
+        return;
+    }
+
     resetClientScreen(title.c_str());
     renderPrompt();