diff --git a/etemplate/js/et2_extension_nextmatch_controller.js b/etemplate/js/et2_extension_nextmatch_controller.js
index 88b92653da..8e6b0f825d 100644
--- a/etemplate/js/et2_extension_nextmatch_controller.js
+++ b/etemplate/js/et2_extension_nextmatch_controller.js
@@ -280,6 +280,28 @@ var et2_nextmatch_controller = et2_dataview_controller.extend(et2_IDataProvider,
 		{
 			this._objectManager = gom.addObject(
 				new egwActionObjectManager(uid, this._actionManager));
+
+			this._objectManager.handleKeyPress = function(_keyCode, _shift, _ctrl, _alt) {
+				for(var i = 0; i < self._actionManager.children.length; i++)
+				{
+					if(typeof self._actionManager.children[i].shortcut === 'object' &&
+						self._actionManager.children[i].shortcut &&
+						_keyCode == self._actionManager.children[i].shortcut.keyCode)
+					{
+						return this.executeActionImplementation(
+							{
+								"keyEvent": {
+									"keyCode": _keyCode,
+									"shift": _shift,
+									"ctrl": _ctrl,
+									"alt": _alt
+								}
+							}, "popup", EGW_AO_EXEC_SELECTED);
+					}
+				}
+				return egwActionObject.prototype.handleKeyPress.call(this, _keyCode,_shift,_ctrl,_alt);
+			}
+			
 		}
 		this._objectManager.flags = this._objectManager.flags
 				| EGW_AO_FLAG_DEFAULT_FOCUS | EGW_AO_FLAG_IS_CONTAINER;
diff --git a/etemplate/js/et2_widget_link.js b/etemplate/js/et2_widget_link.js
index ce7d2bce7b..3e81e77d59 100644
--- a/etemplate/js/et2_widget_link.js
+++ b/etemplate/js/et2_widget_link.js
@@ -1508,7 +1508,7 @@ var et2_link_list = et2_link_string.extend(
 
 		this.list = $j(document.createElement("table"))
 			.addClass("et2_link_list");
-		if(this.options['class']) this.node.addClass(this.options['class']);
+		if(this.options['class']) this.list.addClass(this.options['class']);
 		this.setDOMNode(this.list[0]);
 
 		// Set up context menu