diff --git a/src/gui/xyOsc.cpp b/src/gui/xyOsc.cpp
index b1094007f..328b86087 100644
--- a/src/gui/xyOsc.cpp
+++ b/src/gui/xyOsc.cpp
@@ -221,11 +221,11 @@ void FurnaceGUI::drawXYOsc() {
       if (ImGui::IsItemClicked(ImGuiMouseButton_Right)) {
         xyOscOptions=true;
       }
-      if (settings.oscTakesEntireWindow) {
-        ImGui::PopStyleVar(3);
-      }
     }
   }
+  if (settings.oscTakesEntireWindow && !xyOscOptions) {
+    ImGui::PopStyleVar(3);
+  }
   if (ImGui::IsWindowFocused(ImGuiFocusedFlags_ChildWindows)) curWindow=GUI_WINDOW_XY_OSC;
   ImGui::End();
 }