diff --git a/src/common/gui/SurgeGUIEditor.cpp b/src/common/gui/SurgeGUIEditor.cpp
index a93d731c0a0..314a12666a3 100644
--- a/src/common/gui/SurgeGUIEditor.cpp
+++ b/src/common/gui/SurgeGUIEditor.cpp
@@ -506,6 +506,13 @@ int32_t SurgeGUIEditor::onKeyDown(const VstKeyCode& code, CFrame* frame)
         switch (code.virt)
         {
         case VKEY_TAB:
+            if (saveDialog && saveDialog->isVisible())
+            {
+               /* 
+               ** SaveDialog gets access to the tab key to switch between fields if it is open
+               */
+               return -1;
+            }
             toggle_mod_editing();
             return 1;
 #if !LINUX