diff --git a/src/app/editor/editor_manager.cc b/src/app/editor/editor_manager.cc
index 474ee486..b4094229 100644
--- a/src/app/editor/editor_manager.cc
+++ b/src/app/editor/editor_manager.cc
@@ -263,8 +263,8 @@ absl::Status EditorManager::Update() {
                        editor->active())) {
         current_editor_ = editor;
         status_ = editor->Update();
-        ImGui::End();
       }
+      ImGui::End();
     }
   }
 
diff --git a/src/app/gui/zeml.cc b/src/app/gui/zeml.cc
index 6550fed0..75df05f6 100644
--- a/src/app/gui/zeml.cc
+++ b/src/app/gui/zeml.cc
@@ -388,8 +388,8 @@ void Render(Node& node) {
         for (auto& child : node.children) {
           Render(child);
         }
-        ImGui::End();
       }
+      ImGui::End();
     } break;
     case WidgetType::Button:
       if (node.attributes.data) {