diff --git a/templates/zerver/find_my_team.html b/templates/zerver/find_my_team.html
index 692d89619b..768ba0a9c6 100644
--- a/templates/zerver/find_my_team.html
+++ b/templates/zerver/find_my_team.html
@@ -36,7 +36,7 @@
       <form class="form-inline" id="find_my_team" name="email_form"
             action="{{ current_url() }}" method="post">
         {{ csrf_input }}
-        <input type="text" class="form-control required"
+        <input type="text" class="form-control required" autofocus
                placeholder="{{ _("Enter email addresses") }}"
                id="emails" name="emails"/>
         <button type="submit" class="btn btn-primary">{{ _('Find team') }}</button>