diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp
index bb53fd2a3..04029c46b 100644
--- a/src/engine/engine.cpp
+++ b/src/engine/engine.cpp
@@ -1997,6 +1997,20 @@ void DivEngine::autoNoteOff(int ch, int note, int vol) {
   }
 }
 
+void DivEngine::autoNoteOffAll() {
+  if (!playing) {
+    reset();
+    freelance=true;
+    playing=true;
+  }
+  for (int i=0; i<chans; i++) {
+    if (chan[i].midiNote!=-1) {
+      pendingNotes.push(DivNoteEvent(i,-1,-1,-1,false));
+      chan[i].midiNote=-1;
+    }
+  }
+}
+
 void DivEngine::setOrder(unsigned char order) {
   BUSY_BEGIN_SOFT;
   curOrder=order;
diff --git a/src/engine/engine.h b/src/engine/engine.h
index 6c1129e9d..fc063a2b1 100644
--- a/src/engine/engine.h
+++ b/src/engine/engine.h
@@ -571,6 +571,7 @@ class DivEngine {
 
     void autoNoteOn(int chan, int ins, int note, int vol=-1);
     void autoNoteOff(int chan, int note, int vol=-1);
+    void autoNoteOffAll();
 
     // go to order
     void setOrder(unsigned char order);
diff --git a/src/gui/doAction.cpp b/src/gui/doAction.cpp
index 808d57a0c..25b4afe6d 100644
--- a/src/gui/doAction.cpp
+++ b/src/gui/doAction.cpp
@@ -99,20 +99,14 @@ void FurnaceGUI::doAction(int what) {
       if (++curOctave>7) {
         curOctave=7;
       } else {
-        for (size_t i=0; i<activeNotes.size(); i++) {
-          e->noteOff(activeNotes[i].chan);
-        }
-        activeNotes.clear();
+        e->autoNoteOffAll();
       }
       break;
     case GUI_ACTION_OCTAVE_DOWN:
       if (--curOctave<-5) {
         curOctave=-5;
       } else {
-        for (size_t i=0; i<activeNotes.size(); i++) {
-          e->noteOff(activeNotes[i].chan);
-        }
-        activeNotes.clear();
+        e->autoNoteOffAll();
       }
       break;
     case GUI_ACTION_INS_UP:
diff --git a/src/gui/editControls.cpp b/src/gui/editControls.cpp
index 5098a73de..722c38f2a 100644
--- a/src/gui/editControls.cpp
+++ b/src/gui/editControls.cpp
@@ -35,10 +35,7 @@ void FurnaceGUI::drawEditControls() {
         if (ImGui::InputInt("##Octave",&curOctave,1,1)) {
           if (curOctave>7) curOctave=7;
           if (curOctave<-5) curOctave=-5;
-          for (size_t i=0; i<activeNotes.size(); i++) {
-            e->noteOff(activeNotes[i].chan);
-          }
-          activeNotes.clear();
+          e->autoNoteOffAll();
 
           if (settings.insFocusesPattern && !ImGui::IsItemActive() && patternOpen) {
             nextWindow=GUI_WINDOW_PATTERN;
@@ -139,10 +136,7 @@ void FurnaceGUI::drawEditControls() {
         if (ImGui::InputInt("##Octave",&curOctave,1,1)) {
           if (curOctave>7) curOctave=7;
           if (curOctave<-5) curOctave=-5;
-          for (size_t i=0; i<activeNotes.size(); i++) {
-            e->noteOff(activeNotes[i].chan);
-          }
-          activeNotes.clear();
+          e->autoNoteOffAll();
 
           if (settings.insFocusesPattern && !ImGui::IsItemActive() && patternOpen) {
             nextWindow=GUI_WINDOW_PATTERN;
@@ -213,10 +207,7 @@ void FurnaceGUI::drawEditControls() {
         if (ImGui::InputInt("##Octave",&curOctave,0,0)) {
           if (curOctave>7) curOctave=7;
           if (curOctave<-5) curOctave=-5;
-          for (size_t i=0; i<activeNotes.size(); i++) {
-            e->noteOff(activeNotes[i].chan);
-          }
-          activeNotes.clear();
+          e->autoNoteOffAll();
 
           if (settings.insFocusesPattern && !ImGui::IsItemActive() && patternOpen) {
             nextWindow=GUI_WINDOW_PATTERN;
@@ -314,10 +305,7 @@ void FurnaceGUI::drawEditControls() {
         if (ImGui::InputInt("##Octave",&curOctave,1,1)) {
           if (curOctave>7) curOctave=7;
           if (curOctave<-5) curOctave=-5;
-          for (size_t i=0; i<activeNotes.size(); i++) {
-            e->noteOff(activeNotes[i].chan);
-          }
-          activeNotes.clear();
+          e->autoNoteOffAll();
 
           if (settings.insFocusesPattern && !ImGui::IsItemActive() && patternOpen) {
             nextWindow=GUI_WINDOW_PATTERN;
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 0488fd539..b37726059 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -1959,7 +1959,7 @@ int _processEvent(void* instance, SDL_Event* event) {
 
 int FurnaceGUI::processEvent(SDL_Event* ev) {
   if (ev->type==SDL_KEYDOWN) {
-    if (!ev->key.repeat && !wantCaptureKeyboard) {
+    if (!ev->key.repeat && !wantCaptureKeyboard && (ev->key.keysym.mod&(~(KMOD_NUM|KMOD_CAPS|KMOD_SCROLL)))==0) {
       switch (curWindow) {
         case GUI_WINDOW_SAMPLE_EDIT:
         case GUI_WINDOW_SAMPLE_LIST: