diff --git a/src/studio/applib/src/newmenu.cpp b/src/studio/applib/src/newmenu.cpp
index 6de16c2f..7e172669 100644
--- a/src/studio/applib/src/newmenu.cpp
+++ b/src/studio/applib/src/newmenu.cpp
@@ -72,7 +72,6 @@ void NewMenu::drawNewItemName(turbine::Context *ctx) noexcept {
 			ImGui::InputText("Name", m_itemName.data(), m_itemName.cap());
 		}
 		drawLastPageButtons(ctx);
-		ImGui::EndPopup();
 	});
 }
 
diff --git a/src/studio/modlib/src/popup.cpp b/src/studio/modlib/src/popup.cpp
index d46b4b6a..d3901778 100644
--- a/src/studio/modlib/src/popup.cpp
+++ b/src/studio/modlib/src/popup.cpp
@@ -13,6 +13,7 @@ void Popup::drawWindow(turbine::Context *ctx, bool *open, const std::function<vo
 	constexpr auto modalFlags = ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoResize;
 	if (ImGui::BeginPopupModal(m_title.c_str(), open, modalFlags)) {
 		drawContents();
+		ImGui::EndPopup();
 	}
 }