diff --git a/src/gui/insEdit.cpp b/src/gui/insEdit.cpp
index c89652a37..662448dfc 100644
--- a/src/gui/insEdit.cpp
+++ b/src/gui/insEdit.cpp
@@ -1608,6 +1608,12 @@ void FurnaceGUI::drawInsEdit() {
         if (ImGui::Button(ICON_FA_FLOPPY_O "##IESave")) {
           doAction(GUI_ACTION_INS_LIST_SAVE);
         }
+        if (ImGui::BeginPopupContextItem("InsSaveFormats",ImGuiMouseButton_Right)) {
+          if (ImGui::MenuItem("save as .dmp...")) {
+            doAction(GUI_ACTION_INS_LIST_SAVE_DMP);
+          }
+          ImGui::EndPopup();
+        }
 
         ImGui::TableNextColumn();
         ImGui::Text("Type");
diff --git a/src/gui/waveEdit.cpp b/src/gui/waveEdit.cpp
index 7e453ef58..01f678624 100644
--- a/src/gui/waveEdit.cpp
+++ b/src/gui/waveEdit.cpp
@@ -138,6 +138,15 @@ void FurnaceGUI::drawWaveEdit() {
         if (ImGui::Button(ICON_FA_FLOPPY_O "##WESave")) {
           doAction(GUI_ACTION_WAVE_LIST_SAVE);
         }
+        if (ImGui::BeginPopupContextItem("WaveSaveFormats",ImGuiMouseButton_Right)) {
+          if (ImGui::MenuItem("save as .dmw...")) {
+            doAction(GUI_ACTION_WAVE_LIST_SAVE_DMW);
+          }
+          if (ImGui::MenuItem("save raw...")) {
+            doAction(GUI_ACTION_WAVE_LIST_SAVE_RAW);
+          }
+          ImGui::EndPopup();
+        }
         ImGui::SameLine();
 
         if (ImGui::RadioButton("Steps",waveEditStyle==0)) {