diff --git a/website/client/components/tasks/taskModal.vue b/website/client/components/tasks/taskModal.vue
index 5dfd10013f..f6ec64691e 100644
--- a/website/client/components/tasks/taskModal.vue
+++ b/website/client/components/tasks/taskModal.vue
@@ -1,6 +1,6 @@
 <template lang="pug">
   form(v-if="task", @submit.stop.prevent="submit()")
-    b-modal#task-modal(size="sm", @hidden="onClose()")
+    b-modal#task-modal(size="sm", @hidden="onClose()", @shown="focusInput()")
       .task-modal-header(slot="modal-header", :class="cssClass('bg')")
         .clearfix
           h1.float-left {{ title }}
@@ -12,7 +12,8 @@
           input.form-control.title-input(
             type="text",
             required, v-model="task.text",
-            autofocus, spellcheck="true",
+            ref="inputToFocus",
+            spellcheck="true",
             :disabled="groupAccessRequiredAndOnPersonalPage || challengeAccessRequired"
           )
         .form-group
@@ -963,6 +964,9 @@ export default {
         userId: memberId,
       });
     },
+    focusInput () {
+      this.$refs.inputToFocus.focus();
+    },
   },
 };
 </script>