diff --git a/mindplot/pom.xml b/mindplot/pom.xml
index d2cf8e8a..c24fd1e9 100644
--- a/mindplot/pom.xml
+++ b/mindplot/pom.xml
@@ -140,6 +140,7 @@
                                         <include>ScreenManager.js</include>
                                         <include>Workspace.js</include>
                                         <include>ShrinkConnector.js</include>
+                                        <include>Keyboard.js</include>
                                         <include>DesignerKeyboard.js</include>
                                         <include>Keyboard.js</include>
                                         <include>TopicStyle.js</include>
diff --git a/mindplot/src/main/javascript/DesignerKeyboard.js b/mindplot/src/main/javascript/DesignerKeyboard.js
index 2a76dd9f..2d988b45 100644
--- a/mindplot/src/main/javascript/DesignerKeyboard.js
+++ b/mindplot/src/main/javascript/DesignerKeyboard.js
@@ -17,7 +17,7 @@
  */
 
 mindplot.DesignerKeyboard = new Class({
-    //Extends: mindplot.Keyboard,
+    Extends: mindplot.Keyboard,
     Static:{
         register:function (designer) {
             this._instance = new mindplot.DesignerKeyboard(designer);
@@ -34,11 +34,6 @@ mindplot.DesignerKeyboard = new Class({
         this._registerEvents(designer);
     },
 
-    //FIXME: mover al parent
-    addShortcut: function(shortcut, callback) {
-        $(document).bind('keydown', shortcut, callback);
-    },
-
     _registerEvents:function (designer) {
 
         // Try with the keyboard ..
diff --git a/mindplot/src/main/javascript/Keyboard.js b/mindplot/src/main/javascript/Keyboard.js
index 05f00601..6053a8f4 100644
--- a/mindplot/src/main/javascript/Keyboard.js
+++ b/mindplot/src/main/javascript/Keyboard.js
@@ -17,6 +17,12 @@
  */
 
 mindplot.Keyboard = new Class({
+
     initialize:function () {
+    },
+
+    addShortcut: function(shortcut, callback) {
+        $(document).bind('keydown', shortcut, callback);
     }
+
 });