diff --git a/app/assets/javascripts/discourse/app/templates/modal/change-owner.hbs b/app/assets/javascripts/discourse/app/templates/modal/change-owner.hbs
index 0e06efcf1b3..3678fd2a1c8 100644
--- a/app/assets/javascripts/discourse/app/templates/modal/change-owner.hbs
+++ b/app/assets/javascripts/discourse/app/templates/modal/change-owner.hbs
@@ -12,7 +12,8 @@
     {{user-selector single="true"
                     usernames=new_user
                     placeholderKey="topic.change_owner.placeholder"
-                    autocomplete="discourse"}}
+                    autocomplete="discourse"
+                    autofocus="autofocus"}}
   </form>
 {{/d-modal-body}}