diff --git a/src/js/main.js b/src/js/main.js
index fb89438..35a2607 100644
--- a/src/js/main.js
+++ b/src/js/main.js
@@ -289,6 +289,10 @@ $(function() {
 
     if (data.numUsers > 1) {
       $('#join-modal').modal('show');
+      $('#join-modal').on('shown.bs.modal', function (e) {
+        $('#join-modal input').focus();
+      });
+
       key = '';
     }
     updateKeyVal(key);