diff --git a/UI/WebServerResources/js/Common/sgHotkeys.service.js b/UI/WebServerResources/js/Common/sgHotkeys.service.js
index 45cde73a9..35ae02b8f 100644
--- a/UI/WebServerResources/js/Common/sgHotkeys.service.js
+++ b/UI/WebServerResources/js/Common/sgHotkeys.service.js
@@ -71,6 +71,7 @@
     };
     // Char-code values for characters that require a key combinations
     var CHAR_CODES = {
+      42: '*',
       63: '?'
     };
 
@@ -272,6 +273,8 @@
               ret = callbackArray.splice(i, 1);
             }
           }
+          if (callbackArray.length === 0)
+            delete this._hotkeys[hotkey.key];
         }
         return ret;
       };