diff --git a/src/single_window/local_peer_window.cpp b/src/single_window/local_peer_window.cpp
index 7122ff7..c255835 100644
--- a/src/single_window/local_peer_window.cpp
+++ b/src/single_window/local_peer_window.cpp
@@ -302,7 +302,6 @@ int Render::LocalWindow() {
     }
 
     ImGui::EndChild();
-    ImGui::PopStyleVar();
   }
 
   ImGui::EndChild();
diff --git a/src/single_window/render.cpp b/src/single_window/render.cpp
index 4d0a117..6f42893 100644
--- a/src/single_window/render.cpp
+++ b/src/single_window/render.cpp
@@ -518,25 +518,37 @@ int Render::Run() {
       ImGui::PopStyleColor();
 
       TitleBar();
-    }
 
-    if (connection_established_ && streaming_ && is_client_mode_) {
-      if (!resizable_) {
-        resizable_ = !resizable_;
-        SDL_SetWindowResizable(main_window_, SDL_TRUE);
+      if (connection_established_ && streaming_ && is_client_mode_) {
+        if (!resizable_) {
+          resizable_ = !resizable_;
+          SDL_SetWindowResizable(main_window_, SDL_TRUE);
+        }
+        ControlWindow();
+      } else {
+        if (resizable_) {
+          resizable_ = !resizable_;
+          SDL_SetWindowResizable(main_window_, SDL_FALSE);
+        }
+        MainWindow();
       }
 
-      ControlWindow();
-    } else {
-      if (resizable_) {
-        resizable_ = !resizable_;
-        SDL_SetWindowResizable(main_window_, SDL_FALSE);
-      }
-      MainWindow();
-    }
-
-    if (!fullscreen_button_pressed_) {
       ImGui::End();
+    } else {
+      if (connection_established_ && streaming_ && is_client_mode_) {
+        if (!resizable_) {
+          resizable_ = !resizable_;
+          SDL_SetWindowResizable(main_window_, SDL_TRUE);
+        }
+
+        ControlWindow();
+      } else {
+        if (resizable_) {
+          resizable_ = !resizable_;
+          SDL_SetWindowResizable(main_window_, SDL_FALSE);
+        }
+        MainWindow();
+      }
     }
 
     // create connection
diff --git a/src/single_window/title_bar.cpp b/src/single_window/title_bar.cpp
index 5c728da..d8af6fc 100644
--- a/src/single_window/title_bar.cpp
+++ b/src/single_window/title_bar.cpp
@@ -48,7 +48,6 @@ int Render::TitleBar() {
       draw_list->AddLine(ImVec2(bar_pos_x, bar_pos_y + 6),
                          ImVec2(bar_pos_x + menu_bar_line_size, bar_pos_y + 6),
                          IM_COL32(0, 0, 0, 255));
-      ImGui::PopStyleColor(2);
 
       {
         SettingWindow();
@@ -56,6 +55,8 @@ int Render::TitleBar() {
       }
     }
 
+    ImGui::PopStyleColor(2);
+
     ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(0, 0, 0, 0));
     ImGui::SetCursorPosX(main_window_width_ - (streaming_
                                                    ? BUTTON_PADDING * 3
@@ -146,11 +147,13 @@ int Render::TitleBar() {
 
     ImGui::PopStyleColor(2);
 
-    ImGui::PopStyleColor(1);
+    ImGui::PopStyleColor();
   }
+
+  ImGui::EndMenuBar();
   ImGui::SetWindowFontScale(1.0f);
 
   ImGui::EndChild();
-  ImGui::PopStyleColor(2);
+  ImGui::PopStyleColor();
   return 0;
 }
\ No newline at end of file
diff --git a/xmake.lua b/xmake.lua
index 391eb6b..ab53426 100644
--- a/xmake.lua
+++ b/xmake.lua
@@ -17,7 +17,7 @@ if is_mode("debug") then
 end
 
 add_requires("spdlog 1.14.1", {system = false})
-add_requires("imgui v1.91.0", {configs = {sdl2 = true, sdl2_renderer = true}})
+add_requires("imgui v1.91.4-docking", {configs = {sdl2 = true, sdl2_renderer = true}})
 add_requires("miniaudio 0.11.21")
 
 if is_os("windows") then