diff --git a/src/single_window/connection_status_window.cpp b/src/single_window/connection_status_window.cpp
index c640ffc..6beb806 100644
--- a/src/single_window/connection_status_window.cpp
+++ b/src/single_window/connection_status_window.cpp
@@ -94,8 +94,7 @@ int Render::ConnectionStatusWindow() {
                 localization::ok[localization_language_index_].c_str())) {
           show_connection_status_window_ = true;
           password_validating_ = true;
-          JoinConnection(peer_reserved_ ? peer_reserved_ : peer_, remote_id_,
-                         remote_password_.c_str());
+          rejoin_ = true;
         }
 
         ImGui::SameLine();
diff --git a/src/single_window/control_bar.cpp b/src/single_window/control_bar.cpp
index f0ade53..bf8b07e 100644
--- a/src/single_window/control_bar.cpp
+++ b/src/single_window/control_bar.cpp
@@ -46,8 +46,7 @@ int Render::ControlBar() {
     }
 
     ImGui::SameLine();
-    ImGui::Dummy(ImVec2(main_window_width_ * 0.91f, 0));
-    ImGui::SameLine();
+    ImGui::SetCursorPosX(main_window_width_ - 35);
   }
 
   std::string control_bar =
diff --git a/src/single_window/remote_peer_window.cpp b/src/single_window/remote_peer_window.cpp
index 7145f5c..ef68f2f 100644
--- a/src/single_window/remote_peer_window.cpp
+++ b/src/single_window/remote_peer_window.cpp
@@ -69,9 +69,9 @@ int Render::RemoteWindow() {
             }
           }
           ret = JoinConnection(peer_reserved_ ? peer_reserved_ : peer_,
-                               remote_id_, client_password_);
+                               remote_id_, remote_password_.c_str());
           if (0 == ret) {
-            if (!peer_reserved_) {
+            if (peer_reserved_) {
               is_client_mode_ = true;
             }
             rejoin_ = false;
diff --git a/src/single_window/render_callback_func.cpp b/src/single_window/render_callback_func.cpp
index 556f002..9d970db 100644
--- a/src/single_window/render_callback_func.cpp
+++ b/src/single_window/render_callback_func.cpp
@@ -182,15 +182,11 @@ void Render::OnConnectionStatusCb(ConnectionStatus status, void *user_data) {
     render->connection_established_ = true;
     render->streaming_ = true;
 
-    if (!render->is_client_mode_) {
+    if (render->peer_reserved_ || !render->is_client_mode_) {
       render->start_screen_capture_ = true;
       render->start_mouse_control_ = true;
-    } else {
-      SDL_SetWindowSize(render->main_window_, render->stream_window_width_,
-                        render->stream_window_height_);
-      SDL_SetWindowPosition(render->main_window_, SDL_WINDOWPOS_CENTERED,
-                            SDL_WINDOWPOS_CENTERED);
     }
+
   } else if (ConnectionStatus::Disconnected == status) {
     render->connection_status_str_ = "Disconnected";
     render->password_validating_time_ = 0;