diff --git a/src/gui/dataList.cpp b/src/gui/dataList.cpp
index cce7f09ca..ccc23243f 100644
--- a/src/gui/dataList.cpp
+++ b/src/gui/dataList.cpp
@@ -704,6 +704,7 @@ void FurnaceGUI::drawSampleList(bool asChild) {
       if (ImGui::MenuItem("save raw...")) {
         doAction(GUI_ACTION_SAMPLE_LIST_SAVE_RAW);
       }
+      ImGui::EndPopup();
     }
     ImGui::SameLine();
     if (ImGui::ArrowButton("SampleUp",ImGuiDir_Up)) {
diff --git a/src/gui/sampleEdit.cpp b/src/gui/sampleEdit.cpp
index 02d03db0b..cb138454c 100644
--- a/src/gui/sampleEdit.cpp
+++ b/src/gui/sampleEdit.cpp
@@ -150,6 +150,7 @@ void FurnaceGUI::drawSampleEdit() {
         if (ImGui::MenuItem("save raw...")) {
           doAction(GUI_ACTION_SAMPLE_LIST_SAVE_RAW);
         }
+        ImGui::EndPopup();
       }
 
       ImGui::SameLine();