diff --git a/imgui_demo.cpp b/imgui_demo.cpp
index 7ee7de827..7bf92e348 100644
--- a/imgui_demo.cpp
+++ b/imgui_demo.cpp
@@ -1877,13 +1877,11 @@ void ImGui::ShowStyleEditor(ImGuiStyle* ref)
     // Simplified Settings
     if (ImGui::SliderFloat("FrameRounding", &style.FrameRounding, 0.0f, 12.0f, "%.0f")) 
         style.GrabRounding = style.FrameRounding; // Make GrabRounding always the same value as FrameRounding
-    bool window_border = (style.WindowBorderSize > 0.0f);
-    if (ImGui::Checkbox("WindowBorder", &window_border))
-        style.WindowBorderSize = window_border ? 1.0f : 0.0f;
+    { bool window_border = (style.WindowBorderSize > 0.0f); if (ImGui::Checkbox("WindowBorder", &window_border)) style.WindowBorderSize = window_border ? 1.0f : 0.0f; }
     ImGui::SameLine();
-    bool frame_border = (style.FrameBorderSize > 0.0f);
-    if (ImGui::Checkbox("FrameBorder", &frame_border))
-        style.FrameBorderSize = frame_border ? 1.0f : 0.0f;
+    { bool frame_border = (style.FrameBorderSize > 0.0f); if (ImGui::Checkbox("FrameBorder", &frame_border)) style.FrameBorderSize = frame_border ? 1.0f : 0.0f; }
+    ImGui::SameLine();
+    { bool popup_border = (style.PopupBorderSize > 0.0f); if (ImGui::Checkbox("PopupBorder", &popup_border)) style.PopupBorderSize = popup_border ? 1.0f : 0.0f; }
 
     // Save/Revert button
     if (ImGui::Button("Save Ref"))