diff --git a/.gitignore b/.gitignore
index 541ff7c46b..996ac1abe1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -68,3 +68,7 @@ client_secret.json
 /app/dist-docs
 /app/mailsync.dSYM.zip
 /snap/snapcraft.yml
+
+**.so*
+**.bin
+**.tar.gz
diff --git a/app/internal_packages/category-picker/lib/label-picker.cjsx b/app/internal_packages/category-picker/lib/label-picker.cjsx
index aceda98e55..328ae6bd28 100644
--- a/app/internal_packages/category-picker/lib/label-picker.cjsx
+++ b/app/internal_packages/category-picker/lib/label-picker.cjsx
@@ -33,7 +33,7 @@ class LabelPicker extends React.Component
     @_account = AccountStore.accountForItems(nextProps.items)
 
   _keymapHandlers: ->
-    "core:change-category": @_onOpenCategoryPopover
+    "core:change-labels": @_onOpenCategoryPopover
 
   _onOpenCategoryPopover: =>
     return unless @props.items.length > 0
@@ -59,7 +59,7 @@ class LabelPicker extends React.Component
         globalMenuItems={[
           {
             "label": "Thread",
-            "submenu": [{ "label": "Apply Labels...", "command": "core:change-category", "position": "endof=thread-actions" }]
+            "submenu": [{ "label": "Apply Labels...", "command": "core:change-labels", "position": "endof=thread-actions" }]
           }
         ]}
         >
diff --git a/app/internal_packages/category-picker/lib/move-picker.cjsx b/app/internal_packages/category-picker/lib/move-picker.cjsx
index 23b259638b..df39a8f672 100644
--- a/app/internal_packages/category-picker/lib/move-picker.cjsx
+++ b/app/internal_packages/category-picker/lib/move-picker.cjsx
@@ -33,7 +33,7 @@ class MovePicker extends React.Component
     @_account = AccountStore.accountForItems(nextProps.items)
 
   _keymapHandlers: ->
-    "core:change-category": @_onOpenCategoryPopover
+    "core:change-folders": @_onOpenCategoryPopover
 
   _onOpenCategoryPopover: =>
     return unless @props.items.length > 0
@@ -58,7 +58,7 @@ class MovePicker extends React.Component
         globalMenuItems={[
           {
             "label": "Thread",
-            "submenu": [{ "label": "Move to Folder...", "command": "core:change-category", "position": "endof=thread-actions" }]
+            "submenu": [{ "label": "Move to Folder...", "command": "core:change-folders", "position": "endof=thread-actions" }]
           }
         ]}
         >
diff --git a/app/internal_packages/preferences/lib/tabs/keymaps/displayed-keybindings.js b/app/internal_packages/preferences/lib/tabs/keymaps/displayed-keybindings.js
index dfbf885e8c..59c459a64e 100644
--- a/app/internal_packages/preferences/lib/tabs/keymaps/displayed-keybindings.js
+++ b/app/internal_packages/preferences/lib/tabs/keymaps/displayed-keybindings.js
@@ -15,7 +15,8 @@ module.exports = [
       ['core:gmail-remove-from-view', 'Gmail Remove from view'],
       ['core:star-item', 'Star'],
       ['core:snooze-item', 'Snooze'],
-      ['core:change-category', 'Change Folder / Labels'],
+      ['core:change-labels', 'Change Labels'],
+      ['core:change-folders', 'Change Folder'],
       ['core:mark-as-read', 'Mark as read'],
       ['core:mark-as-unread', 'Mark as unread'],
       ['core:mark-important', 'Mark as important (Gmail)'],
diff --git a/app/keymaps/templates/Gmail.json b/app/keymaps/templates/Gmail.json
index 9f69938959..c62266d910 100644
--- a/app/keymaps/templates/Gmail.json
+++ b/app/keymaps/templates/Gmail.json
@@ -36,7 +36,8 @@
 
   "core:mute-conversation": "m",
   "core:focus-search": "/",
-  "core:change-category": ["l", "v"],
+  "core:change-labels": "l",
+  "core:change-folders": "v",
   "core:focus-toolbar": ",",
   "core:star-item": "s",
   "core:gmail-remove-from-view": "y",