diff --git a/assets/javascripts/discourse/templates/modal/assign-user.hbs b/assets/javascripts/discourse/templates/modal/assign-user.hbs
index 299387d..db1e97e 100644
--- a/assets/javascripts/discourse/templates/modal/assign-user.hbs
+++ b/assets/javascripts/discourse/templates/modal/assign-user.hbs
@@ -20,7 +20,7 @@
           maximum=1
           autofocus=autofocus
           tabindex=1
-          expandedOnInsert=true
+          expandedOnInsert=(not assigneeName)
         )
       }}
       {{#if this.assigneeError}}