diff --git a/assets/javascripts/discourse-assign/controllers/assign-user.js.es6 b/assets/javascripts/discourse-assign/controllers/assign-user.js.es6
index d41c0ef..2a2505e 100644
--- a/assets/javascripts/discourse-assign/controllers/assign-user.js.es6
+++ b/assets/javascripts/discourse-assign/controllers/assign-user.js.es6
@@ -18,6 +18,10 @@ export default Ember.Controller.extend({
     });
   },
 
+  onShow() {
+    document.activeElement.blur();
+  },
+
   onClose() {
     if (this.get("model.onClose") && this.get("model.username")) {
       this.get("model.onClose")(this.get("model.username"));
diff --git a/assets/javascripts/discourse/templates/modal/assign-user.hbs b/assets/javascripts/discourse/templates/modal/assign-user.hbs
index 71974ae..98f54e5 100644
--- a/assets/javascripts/discourse/templates/modal/assign-user.hbs
+++ b/assets/javascripts/discourse/templates/modal/assign-user.hbs
@@ -11,6 +11,7 @@
       usernames=model.username
       placeholderKey=placeholderKey
       autocomplete="off"
+      autofocus="autofocus"
     }}
     <div class="assign-suggestions">
       {{#each assignSuggestions as |user|}}