diff --git a/app/src/processing/app/EditorToolbar.java b/app/src/processing/app/EditorToolbar.java
index 67edcdb79..d007ed724 100644
--- a/app/src/processing/app/EditorToolbar.java
+++ b/app/src/processing/app/EditorToolbar.java
@@ -43,7 +43,7 @@ public class EditorToolbar extends JComponent implements MouseInputListener, Key
 
   /** Titles for each button when the shift key is pressed. */ 
   static final String titleShift[] = {
-    _("Verify"), _("Upload Using Programmer"), _("New"), _("Open in Another Window"), _("Save"), _("Serial Monitor")
+    _("Verify"), _("Upload Using Programmer"), _("New"), _("Open in Another Window"), _("Save As..."), _("Serial Monitor")
   };
 
   static final int BUTTON_COUNT  = title.length;
@@ -342,7 +342,11 @@ public class EditorToolbar extends JComponent implements MouseInputListener, Key
       break;
 
     case SAVE:
-      editor.handleSave(false);
+      if (e.isShiftDown()) {
+        editor.handleSaveAs();
+      } else {
+        editor.handleSave(false);
+      }
       break;
 
     case EXPORT: