diff --git a/keymaps/linux.cson b/keymaps/linux.cson
index 2cb431e7f..7126fd4ed 100644
--- a/keymaps/linux.cson
+++ b/keymaps/linux.cson
@@ -16,7 +16,7 @@
   # Sublime Parity
   'ctrl-N': 'application:new-window'
   'ctrl-W': 'window:close'
-  'ctrl-o': 'application:open'
+  'ctrl-o': 'application:open-file'
   'ctrl-q': 'application:quit'
   'ctrl-T': 'pane:reopen-closed-item'
   'ctrl-n': 'application:new-file'
diff --git a/keymaps/win32.cson b/keymaps/win32.cson
index b9a3364da..9c51ac5ba 100644
--- a/keymaps/win32.cson
+++ b/keymaps/win32.cson
@@ -14,7 +14,7 @@
   # Sublime Parity
   'ctrl-N': 'application:new-window'
   'ctrl-W': 'window:close'
-  'ctrl-o': 'application:open'
+  'ctrl-o': 'application:open-file'
   'ctrl-T': 'pane:reopen-closed-item'
   'ctrl-n': 'application:new-file'
   'ctrl-s': 'core:save'
diff --git a/menus/linux.cson b/menus/linux.cson
index 2b5658112..8ffb657d4 100644
--- a/menus/linux.cson
+++ b/menus/linux.cson
@@ -4,7 +4,8 @@
     submenu: [
       { label: 'New &Window', command: 'application:new-window' }
       { label: '&New File', command: 'application:new-file' }
-      { label: '&Open...', command: 'application:open' }
+      { label: '&Open File...', command: 'application:open-file' }
+      { label: 'Open Folder...', command: 'application:open-folder' }
       { label: 'Reopen Last &Item', command: 'pane:reopen-closed-item' }
       { type: 'separator' }
       { label: '&Preferences...', command: 'application:show-settings' }
diff --git a/menus/win32.cson b/menus/win32.cson
index f69ab563c..ad52c6e71 100644
--- a/menus/win32.cson
+++ b/menus/win32.cson
@@ -4,7 +4,8 @@
     submenu: [
       { label: 'New &Window', command: 'application:new-window' }
       { label: '&New File', command: 'application:new-file' }
-      { label: '&Open...', command: 'application:open' }
+      { label: '&Open File...', command: 'application:open-file' }
+      { label: 'Open Folder...', command: 'application:open-folder' }
       { label: 'Reopen Last &Item', command: 'pane:reopen-closed-item' }
       { type: 'separator' }
       { label: '&Preferences...', command: 'application:show-settings' }