diff --git a/src/engine/engine.h b/src/engine/engine.h
index 419cea95a..587f84b4f 100644
--- a/src/engine/engine.h
+++ b/src/engine/engine.h
@@ -364,6 +364,9 @@ class DivEngine {
     // add instrument
     int addInstrument(int refChan=0);
 
+    // add instrument from file
+    int addInstrumentFromFile(const char* path);
+
     // delete instrument
     void delInstrument(int index);
 
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 1e41e313a..2fd784d63 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -527,6 +527,15 @@ void FurnaceGUI::drawInsList() {
       modified=true;
     }
     ImGui::SameLine();
+    if (ImGui::Button(ICON_FA_FILES_O "##InsClone")) {
+      if (curIns>=0 && curIns<(int)e->song.ins.size()) {
+        int prevIns=curIns;
+        curIns=e->addInstrument(cursor.xCoarse);
+        (*e->song.ins[curIns])=(*e->song.ins[prevIns]);
+        modified=true;
+      }
+    }
+    ImGui::SameLine();
     if (ImGui::ArrowButton("InsUp",ImGuiDir_Up)) {
       if (e->moveInsUp(curIns)) curIns--;
     }
@@ -536,10 +545,12 @@ void FurnaceGUI::drawInsList() {
     }
     ImGui::SameLine();
     if (ImGui::Button(ICON_FA_TIMES "##InsDelete")) {
-      e->delInstrument(curIns);
-      modified=true;
-      if (curIns>=(int)e->song.ins.size()) {
-        curIns--;
+      if (curIns>=0 && curIns<(int)e->song.ins.size()) {
+        e->delInstrument(curIns);
+        modified=true;
+        if (curIns>=(int)e->song.ins.size()) {
+          curIns--;
+        }
       }
     }
     ImGui::Separator();
@@ -1084,6 +1095,15 @@ void FurnaceGUI::drawWaveList() {
       modified=true;
     }
     ImGui::SameLine();
+    if (ImGui::Button(ICON_FA_FILES_O "##WaveClone")) {
+      if (curWave>=0 && curWave<(int)e->song.wave.size()) {
+        int prevWave=curWave;
+        curWave=e->addWave();
+        (*e->song.wave[curWave])=(*e->song.wave[prevWave]);
+        modified=true;
+      }
+    }
+    ImGui::SameLine();
     if (ImGui::ArrowButton("WaveUp",ImGuiDir_Up)) {
       if (e->moveWaveUp(curWave)) curWave--;
     }
@@ -1093,10 +1113,12 @@ void FurnaceGUI::drawWaveList() {
     }
     ImGui::SameLine();
     if (ImGui::Button(ICON_FA_TIMES "##WaveDelete")) {
-      e->delWave(curWave);
-      modified=true;
-      if (curWave>=(int)e->song.wave.size()) {
-        curWave--;
+      if (curWave>=0 && curWave<(int)e->song.wave.size()) {
+        e->delWave(curWave);
+        modified=true;
+        if (curWave>=(int)e->song.wave.size()) {
+          curWave--;
+        }
       }
     }
     ImGui::Separator();