diff --git a/src/single_window/connection_status_window.cpp b/src/single_window/connection_status_window.cpp
index 2d0b784..288e78e 100644
--- a/src/single_window/connection_status_window.cpp
+++ b/src/single_window/connection_status_window.cpp
@@ -154,6 +154,7 @@ int Render::ConnectionStatusWindow() {
               localization::ok[localization_language_index_].c_str()) ||
           ImGui::IsKeyPressed(ImGuiKey_Enter)) {
         show_connection_status_window_ = false;
+        re_enter_remote_id_ = true;
       }
     }
 
diff --git a/src/single_window/remote_peer_window.cpp b/src/single_window/remote_peer_window.cpp
index 0db2e28..fe191be 100644
--- a/src/single_window/remote_peer_window.cpp
+++ b/src/single_window/remote_peer_window.cpp
@@ -54,6 +54,11 @@ int Render::RemoteWindow() {
       ImGui::SetNextItemWidth(IPUT_WINDOW_WIDTH);
       ImGui::SetWindowFontScale(1.0f);
       ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 1.0f);
+      if (re_enter_remote_id_) {
+        ImGui::SetKeyboardFocusHere();
+        re_enter_remote_id_ = false;
+        memset(remote_id_display_, 0, sizeof(remote_id_display_));
+      }
       bool enter_pressed = ImGui::InputText(
           "##remote_id_", remote_id_display_, IM_ARRAYSIZE(remote_id_display_),
           ImGuiInputTextFlags_CharsUppercase |
diff --git a/src/single_window/render.h b/src/single_window/render.h
index f711cc2..e70d091 100644
--- a/src/single_window/render.h
+++ b/src/single_window/render.h
@@ -305,6 +305,7 @@ class Render {
   bool show_confirm_delete_connection_ = false;
   bool delete_connection_ = false;
   bool remember_password_ = false;
+  bool re_enter_remote_id_ = false;
 
   double copy_start_time_ = 0;
   double regenerate_password_start_time_ = 0;