diff --git a/keymaps/base-darwin.cson b/keymaps/base-darwin.cson
index 54db00738..ce02dc47d 100644
--- a/keymaps/base-darwin.cson
+++ b/keymaps/base-darwin.cson
@@ -7,7 +7,7 @@
 'body':
   'cmd-m': 'application:minimize'
   'cmd-h': 'application:hide'
-  'cmd-shift-1': 'application:show-main-window'
+  'cmd-0': 'application:show-main-window'
   'cmd-alt-h': 'application:hide-other-applications'
   'cmd-ctrl-f': 'window:toggle-full-screen'
   'alt-cmd-ctrl-m': 'application:zoom'
diff --git a/package.json b/package.json
index 7420b3ab6..cc59989fe 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
   "dependencies": {
     "asar": "^0.5.0",
     "async": "^0.9",
-    "atom-keymap": "6.1.0",
+    "atom-keymap": "5.1.11",
     "babel-core": "^6.0.20",
     "babel-preset-es2015": "^6.0.15",
     "babel-preset-react": "^6.0.15",
diff --git a/src/flux/stores/account-store.coffee b/src/flux/stores/account-store.coffee
index c7e46e4cb..6268ef1a3 100644
--- a/src/flux/stores/account-store.coffee
+++ b/src/flux/stores/account-store.coffee
@@ -43,9 +43,8 @@ class AccountStore
     return commands
 
   _selectAccountByIndex: (index) =>
-    @_index = Math.min(@_accounts.length - 1, Math.max(0, index))
-    atom.config.set(saveIndexKey, @_index)
-    @trigger()
+    index = Math.min(@_accounts.length - 1, Math.max(0, index))
+    Actions.selectAccountId(@_accounts[index].id)
 
   _load: =>
     @_accounts = []