diff --git a/content/mappings.js b/content/mappings.js
index 9671fc48..0b632a36 100644
--- a/content/mappings.js
+++ b/content/mappings.js
@@ -302,11 +302,13 @@ vimperator.Mappings = function () //{{{
 
         get: function (mode, cmd)
         {
+            mode = mode || vimperator.modes.NORMAL;
             return getMap(mode, cmd, user) || getMap(mode, cmd, main);
         },
 
         getDefault: function (mode, cmd)
         {
+            mode = mode || vimperator.modes.NORMAL;
             return getMap(mode, cmd, main);
         },
 
diff --git a/content/util.js b/content/util.js
index 59eba5c1..ed39089e 100644
--- a/content/util.js
+++ b/content/util.js
@@ -160,7 +160,7 @@ vimperator.util = { //{{{
         ret += "\n________________________________________________________________________________\n"
 
         // the actual help text
-        if (command.shortHelp)
+        if (command.description)
         {
             ret += command.description + "."; // the help description
             if (extraHelp)