diff --git a/api/js/etemplate/Et2Link/Et2LinkSearch.ts b/api/js/etemplate/Et2Link/Et2LinkSearch.ts
index 9c1d62e58c..59fde78156 100644
--- a/api/js/etemplate/Et2Link/Et2LinkSearch.ts
+++ b/api/js/etemplate/Et2Link/Et2LinkSearch.ts
@@ -52,7 +52,7 @@ export class Et2LinkSearch extends Et2Select
 
 	get _appNode() : Et2LinkAppSelect
 	{
-		return this.parentNode.querySelector("et2-link-apps");
+		return this.parentNode?.querySelector("et2-link-apps");
 	}
 
 	/**
@@ -64,7 +64,7 @@ export class Et2LinkSearch extends Et2Select
 
 	protected remoteQuery(search : string, options : object)
 	{
-		let request = this.egw().request(this.searchUrl, [this._appNode.value, '', search, options]);
+		let request = this.egw().request(this.searchUrl, [this._appNode?.value ?? options.app, '', search, options]);
 		if(this.query && typeof this.query == "function")
 		{
 			if(!this.query(request, this))