diff --git a/etemplate/js/et2_extension_nextmatch.js b/etemplate/js/et2_extension_nextmatch.js
index 5a7c7cfb57..1a7eacedcc 100644
--- a/etemplate/js/et2_extension_nextmatch.js
+++ b/etemplate/js/et2_extension_nextmatch.js
@@ -1525,7 +1525,7 @@ var et2_nextmatch = et2_DOMWidget.extend([et2_IResizeable, et2_IInput],
 		{
 			this.options.actions = actions;
 			this.options.settings.action_links = this.controller._actionLinks = this._get_action_links(actions);
-			this.controller._actionManager.updateActions(actions,this.controller.egw.appName);
+			this.controller._initActions(actions);
 		}
 	},
 
diff --git a/etemplate/js/et2_extension_nextmatch_controller.js b/etemplate/js/et2_extension_nextmatch_controller.js
index f2eebcaa35..45d3ff5326 100644
--- a/etemplate/js/et2_extension_nextmatch_controller.js
+++ b/etemplate/js/et2_extension_nextmatch_controller.js
@@ -188,7 +188,10 @@ var et2_nextmatch_controller = et2_dataview_controller.extend(et2_IDataProvider,
 		// Initialize the action manager and add some actions to it
 		// Only look 1 level deep
 		var gam = egw_getActionManager(this.egw.appName,true,1);
-		this._actionManager = gam.addAction("actionManager", uid);
+		if(this._actionManager == null)
+		{
+			this._actionManager = gam.addAction("actionManager", uid);
+		}
 		this._actionManager.updateActions(_actions, this.egw.appName);
 		var data = this._actionManager.data;
 		if (data == 'undefined' || !data)