diff --git a/admin/inc/class.admin_ui.inc.php b/admin/inc/class.admin_ui.inc.php
index e03d9b3345..9f4552c037 100644
--- a/admin/inc/class.admin_ui.inc.php
+++ b/admin/inc/class.admin_ui.inc.php
@@ -559,7 +559,7 @@ class admin_ui
 					{
 						$data['id'] = $root.($app == 'admin' ? 'admin' : 'apps/'.$app).'/';
 						$matches = null;
-						if (preg_match_all('/(menuaction|load)=([^&]+)/', $data['link'], $matches))
+						if(preg_match_all('/(menuaction|load)=([^&\',]+)/', $data['link'], $matches))
 						{
 							$data[Tree::ID] .= $matches[2][(int)array_search('load', $matches[1])];
 						}
diff --git a/api/js/etemplate/Et2Tree/Et2Tree.ts b/api/js/etemplate/Et2Tree/Et2Tree.ts
index 828a741601..c8f07e398a 100644
--- a/api/js/etemplate/Et2Tree/Et2Tree.ts
+++ b/api/js/etemplate/Et2Tree/Et2Tree.ts
@@ -536,6 +536,16 @@ export class Et2Tree extends Et2WidgetWithSelectMixin(LitElement)
 		item.focused = true
 	}
 
+	public openItem(_id)
+	{
+		let item = this.getNode(_id);
+		if(item)
+		{
+			item.open = true;
+		}
+		this.requestUpdate();
+	}
+
 	/**
 	 * hasChildren
 	 *