diff --git a/src/commands/index.js b/src/commands/index.js
index 6790a0c08..8eede3028 100644
--- a/src/commands/index.js
+++ b/src/commands/index.js
@@ -32,38 +32,39 @@ import CommandAbstract from './view/CommandAbstract';
 import defaults from './config/config';
 import { eventDrag } from 'dom_components/model/Component';
 
+const commandsDef = [
+  ['preview', 'Preview', 'preview'],
+  ['resize', 'Resize', 'resize'],
+  ['fullscreen', 'Fullscreen', 'fullscreen'],
+  ['copy', 'CopyComponent'],
+  ['paste', 'PasteComponent'],
+  ['canvas-move', 'CanvasMove'],
+  ['canvas-clear', 'CanvasClear'],
+  ['open-code', 'ExportTemplate', 'export-template'],
+  ['open-layers', 'OpenLayers', 'open-layers'],
+  ['open-styles', 'OpenStyleManager', 'open-sm'],
+  ['open-traits', 'OpenTraitManager', 'open-tm'],
+  ['open-blocks', 'OpenBlocks', 'open-blocks'],
+  ['open-assets', 'OpenAssets', 'open-assets'],
+  ['component-select', 'SelectComponent', 'select-comp'],
+  ['component-outline', 'SwitchVisibility', 'sw-visibility'],
+  ['component-offset', 'ShowOffset', 'show-offset'],
+  ['component-move', 'MoveComponent', 'move-comp'],
+  ['component-next', 'ComponentNext'],
+  ['component-prev', 'ComponentPrev'],
+  ['component-enter', 'ComponentEnter'],
+  ['component-exit', 'ComponentExit', 'select-parent'],
+  ['component-delete', 'ComponentDelete'],
+  ['component-style-clear', 'ComponentStyleClear'],
+  ['component-drag', 'ComponentDrag']
+];
+
 export default () => {
   let em;
   let c = {};
   const commands = {};
   const defaultCommands = {};
   const active = {};
-  const commandsDef = [
-    ['preview', 'Preview', 'preview'],
-    ['resize', 'Resize', 'resize'],
-    ['fullscreen', 'Fullscreen', 'fullscreen'],
-    ['copy', 'CopyComponent'],
-    ['paste', 'PasteComponent'],
-    ['canvas-move', 'CanvasMove'],
-    ['canvas-clear', 'CanvasClear'],
-    ['open-code', 'ExportTemplate', 'export-template'],
-    ['open-layers', 'OpenLayers', 'open-layers'],
-    ['open-styles', 'OpenStyleManager', 'open-sm'],
-    ['open-traits', 'OpenTraitManager', 'open-tm'],
-    ['open-blocks', 'OpenBlocks', 'open-blocks'],
-    ['open-assets', 'OpenAssets', 'open-assets'],
-    ['component-select', 'SelectComponent', 'select-comp'],
-    ['component-outline', 'SwitchVisibility', 'sw-visibility'],
-    ['component-offset', 'ShowOffset', 'show-offset'],
-    ['component-move', 'MoveComponent', 'move-comp'],
-    ['component-next', 'ComponentNext'],
-    ['component-prev', 'ComponentPrev'],
-    ['component-enter', 'ComponentEnter'],
-    ['component-exit', 'ComponentExit', 'select-parent'],
-    ['component-delete', 'ComponentDelete'],
-    ['component-style-clear', 'ComponentStyleClear'],
-    ['component-drag', 'ComponentDrag']
-  ];
 
   // Need it here as it would be used below
   const add = function(id, obj) {
diff --git a/src/keymaps/index.js b/src/keymaps/index.js
index 465e55a34..462479201 100644
--- a/src/keymaps/index.js
+++ b/src/keymaps/index.js
@@ -200,7 +200,7 @@ export default () => {
 
       if (keymap) {
         delete keymaps[id];
-        keymaster.unbind(keymap.keys);
+        keymap.keys.split(',').forEach(k => keymaster.unbind(k.trim()));
         em && em.trigger('keymap:remove', keymap);
         return keymap;
       }