diff --git a/subprojects/imgui.wrap b/subprojects/imgui.wrap
index 7494556bf2..a29e9ac92f 100644
--- a/subprojects/imgui.wrap
+++ b/subprojects/imgui.wrap
@@ -1,4 +1,4 @@
 [wrap-git]
 url=https://github.com/xemu-project/imgui
-revision=80cbdab5ecd70db79917c448c333163995e605a5
+revision=7219d617a32b594f9a80b2356aec42e0e939e938
 depth=1
diff --git a/subprojects/implot.wrap b/subprojects/implot.wrap
index 78c9322e66..43e9c9023e 100644
--- a/subprojects/implot.wrap
+++ b/subprojects/implot.wrap
@@ -1,4 +1,4 @@
 [wrap-git]
 url=https://github.com/xemu-project/implot
-revision=006a1c23e5706bbe816968163b4d589162257a57
+revision=8553562dbb2025fd520f4bed57b094767b96c670
 depth=1
diff --git a/ui/xui/main-menu.cc b/ui/xui/main-menu.cc
index d68138dceb..64067a1d99 100644
--- a/ui/xui/main-menu.cc
+++ b/ui/xui/main-menu.cc
@@ -130,12 +130,15 @@ void MainMenuInputView::Draw()
         float x = b_x + i * b_x_stride;
         ImGui::PushStyleColor(ImGuiCol_Button,
                               is_selected ? color_active : color_inactive);
+        ImGui::PushStyleVar(ImGuiStyleVar_FramePadding,
+                            g_viewport_mgr.Scale(ImVec2(port_padding, port_padding)));
         bool activated = ImGui::ImageButton(
+            "port_image_button",
             id,
             ImVec2(b_w * g_viewport_mgr.m_scale, b_h * g_viewport_mgr.m_scale),
             ImVec2(x / t_w, (b_y + b_h) / t_h),
-            ImVec2((x + b_w) / t_w, b_y / t_h),
-            port_padding * g_viewport_mgr.m_scale);
+            ImVec2((x + b_w) / t_w, b_y / t_h));
+        ImGui::PopStyleVar();
         ImGui::PopStyleColor();
 
         if (activated) {
diff --git a/ui/xui/main.cc b/ui/xui/main.cc
index 069a6282f9..699805f113 100644
--- a/ui/xui/main.cc
+++ b/ui/xui/main.cc
@@ -208,7 +208,7 @@ void xemu_hud_render(void)
 
     ImGui_ImplOpenGL3_NewFrame();
     io.ConfigFlags &= ~ImGuiConfigFlags_NavEnableGamepad;
-    ImGui_ImplSDL2_NewFrame(g_sdl_window);
+    ImGui_ImplSDL2_NewFrame();
     io.ConfigFlags |= ImGuiConfigFlags_NavEnableGamepad;
     io.BackendFlags |= ImGuiBackendFlags_HasGamepad;
     g_input_mgr.Update();