diff --git a/api/js/etemplate/Et2Dialog/Et2Dialog.ts b/api/js/etemplate/Et2Dialog/Et2Dialog.ts
index 338667b8fe..191df5e0c7 100644
--- a/api/js/etemplate/Et2Dialog/Et2Dialog.ts
+++ b/api/js/etemplate/Et2Dialog/Et2Dialog.ts
@@ -1004,7 +1004,7 @@ export class Et2Dialog extends Et2Widget(SlotMixin(SlDialog))
 
 	get _contentNode() : HTMLElement
 	{
-		return this.querySelector('.dialog_content') ?? this.querySelector("*");
+		return this.querySelector('.dialog_content');
 	}
 
 	_setupMoveResize()
diff --git a/preferences/js/app.ts b/preferences/js/app.ts
index 0fb6082645..c2eb0b7198 100644
--- a/preferences/js/app.ts
+++ b/preferences/js/app.ts
@@ -46,14 +46,14 @@ export class PreferencesApp extends EgwApp
 	{
 		console.log('app.preferences.addToken', arguments);
 
-		this.dialogExec('preferences.EGroupware\\Preferences\\Token.edit');
+		this.openDialog('preferences.EGroupware\\Preferences\\Token.edit');
 	}
 
 	editToken(_action, _selection)
 	{
 		console.log('app.preferences.editToken', arguments);
 
-		this.dialogExec('preferences.EGroupware\\Preferences\\Token.edit&token_id='+_selection[0].id.split('::')[1]);
+		this.openDialog('preferences.EGroupware\\Preferences\\Token.edit&token_id='+_selection[0].id.split('::')[1]);
 	}
 }