diff --git a/imgui.cpp b/imgui.cpp
index b45e6ace..85a207b2 100644
--- a/imgui.cpp
+++ b/imgui.cpp
@@ -4434,7 +4434,8 @@ void ImGui::End()
     ImGuiContext& g = *GImGui;
     ImGuiWindow* window = g.CurrentWindow;
 
-    Columns(1, "#CloseColumns");
+    if (window->DC.ColumnsCount != 1) // close columns set if any is open
+        Columns(1, "#CLOSECOLUMNS");
     PopClipRect();   // inner window clip rectangle
 
     // Stop logging