diff --git a/assets/javascripts/discourse-assign/controllers/assign-user.js.es6 b/assets/javascripts/discourse-assign/controllers/assign-user.js.es6
index fb7bf22..198e9ee 100644
--- a/assets/javascripts/discourse-assign/controllers/assign-user.js.es6
+++ b/assets/javascripts/discourse-assign/controllers/assign-user.js.es6
@@ -1,12 +1,14 @@
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { inject as controller } from "@ember/controller";
+import { not } from "@ember/object/computed";
 
 export default Ember.Controller.extend({
   topicBulkActions: controller(),
   assignSuggestions: null,
   allowedGroups: null,
   taskActions: Ember.inject.service(),
+  autofocus: not("capabilities.touch"),
 
   init() {
     this._super(...arguments);
diff --git a/assets/javascripts/discourse/templates/modal/assign-user.hbs b/assets/javascripts/discourse/templates/modal/assign-user.hbs
index 298f993..e84b405 100644
--- a/assets/javascripts/discourse/templates/modal/assign-user.hbs
+++ b/assets/javascripts/discourse/templates/modal/assign-user.hbs
@@ -11,6 +11,7 @@
         includeGroups=false
         groupMembersOf=allowedGroups
         maximum=1
+        autofocus=autofocus
       )
     }}
     <div class="assign-suggestions">