diff --git a/api/js/etemplate/Et2Link/Et2LinkAppSelect.ts b/api/js/etemplate/Et2Link/Et2LinkAppSelect.ts
index 7db441fa06..ea5594ecad 100644
--- a/api/js/etemplate/Et2Link/Et2LinkAppSelect.ts
+++ b/api/js/etemplate/Et2Link/Et2LinkAppSelect.ts
@@ -106,14 +106,6 @@ export class Et2LinkAppSelect extends SlotMixin(Et2Select)
 	{
 		super.connectedCallback();
 
-		if(this.select_options != null)
-		{
-			// Preset to last application
-			if(!this.value)
-			{
-				this.value = <string>this.egw().preference('link_app', this.egw().app_name());
-			}
-		}
 		// Set icon
 		this.querySelector("[slot='prefix']").setAttribute("src", this.value + "/navbar");
 
@@ -210,6 +202,10 @@ export class Et2LinkAppSelect extends SlotMixin(Et2Select)
 				delete select_options['addressbook-email'];
 			}
 		}
+		if (!this.value)
+		{
+			this.value = <string>this.egw().preference('link_app', this.egw().app_name());
+		}
 		this.select_options = select_options;
 	}