diff --git a/app/ui/contextmenu.js b/app/ui/contextmenu.js
index 0e291798..39ddf194 100644
--- a/app/ui/contextmenu.js
+++ b/app/ui/contextmenu.js
@@ -1,8 +1,15 @@
 const editMenu = require('../menus/menus/edit');
 const shellMenu = require('../menus/menus/shell');
-const {getKeymaps: commands} = require('../config');
+const {execCommand} = require('../commands');
+const {getDecoratedKeymaps} = require('../plugins');
 const separator = {type: 'separator'};
 
+const allCommandKeys = getDecoratedKeymaps();
+const commandKeys = Object.keys(allCommandKeys).reduce((result, command) => {
+  result[command] = allCommandKeys[command][0];
+  return result;
+}, {});
+
 // only display cut/copy when there's a cursor selection
 const filterCutCopy = (selection, menuItem) => {
   if (/^cut$|^copy$/.test(menuItem.role) && !selection) {
@@ -12,7 +19,7 @@ const filterCutCopy = (selection, menuItem) => {
 };
 
 module.exports = (createWindow, selection) => {
-  const _shell = shellMenu(commands, createWindow).submenu;
-  const _edit = editMenu(commands).submenu.filter(filterCutCopy.bind(null, selection));
+  const _shell = shellMenu(commandKeys, execCommand).submenu;
+  const _edit = editMenu(commandKeys, execCommand).submenu.filter(filterCutCopy.bind(null, selection));
   return _edit.concat(separator, _shell);
 };