diff --git a/api/js/etemplate/Et2Select/SearchMixin.ts b/api/js/etemplate/Et2Select/SearchMixin.ts
index 24a131ba9e..0c0496a77e 100644
--- a/api/js/etemplate/Et2Select/SearchMixin.ts
+++ b/api/js/etemplate/Et2Select/SearchMixin.ts
@@ -455,7 +455,7 @@ export const Et2WithSearchMixin = <T extends Constructor<LitElement>>(superclass
 				this._searchInputNode.focus();
 				this._searchInputNode.select();
 			}
-			if(this.allowFreeEntries && !this.multiple)
+			if(this.editModeEnabled && this.allowFreeEntries && !this.multiple)
 			{
 				this.startEdit();
 				this._editInputNode.select();