diff --git a/src/app/editor.coffee b/src/app/editor.coffee
index 7d8b2b1a6..d0be64e3f 100644
--- a/src/app/editor.coffee
+++ b/src/app/editor.coffee
@@ -151,6 +151,7 @@ class Editor extends View
         'core:select-to-bottom': @selectToBottom
         'core:close': @destroyActiveEditSession
         'editor:save': @save
+        'editor:save-as': @saveAs
         'editor:newline-below': @insertNewlineBelow
         'editor:toggle-soft-tabs': @toggleSoftTabs
         'editor:toggle-soft-wrap': @toggleSoftWrap
@@ -653,6 +654,9 @@ class Editor extends View
       session.save()
       onSuccess?()
     else
+      @saveAs(session, onSuccess)
+
+  saveAs: (session=@activeEditSession, onSuccess) ->
       atom.showSaveDialog (path) =>
         if path
           session.saveAs(path)
diff --git a/src/app/keymaps/atom.cson b/src/app/keymaps/atom.cson
index 0780ad30e..a4f64a990 100644
--- a/src/app/keymaps/atom.cson
+++ b/src/app/keymaps/atom.cson
@@ -22,7 +22,7 @@
   'pageup': 'core:page-up'
   'pagedown': 'core:page-down'
 
-  'meta-S': 'window:save-all'
+  'meta-alt-s': 'window:save-all'
   'meta-W': 'window:close'
   'meta-+': 'window:increase-font-size'
   'meta--': 'window:decrease-font-size'
@@ -33,4 +33,4 @@
 '.tool-panel':
   'meta-escape': 'tool-panel:unfocus'
   'escape': 'core:close'
-  'meta-w': 'noop'
\ No newline at end of file
+  'meta-w': 'noop'
diff --git a/src/app/keymaps/editor.cson b/src/app/keymaps/editor.cson
index 376f822a2..7232af732 100644
--- a/src/app/keymaps/editor.cson
+++ b/src/app/keymaps/editor.cson
@@ -1,5 +1,6 @@
 '.editor':
   'meta-s': 'editor:save'
+  'meta-S': 'editor:save-as'
   'enter': 'editor:newline'
   'meta-enter': 'editor:newline-below'
   'tab': 'editor:indent'