diff --git a/static/js/profile.js b/static/js/profile.js
index 74d34433..595ffb98 100644
--- a/static/js/profile.js
+++ b/static/js/profile.js
@@ -10,4 +10,12 @@ $(function() {
         return false;
     });
 
+    $('#invite-team-member-modal').on('shown.bs.modal', function () {
+        $('#itm-email').focus();
+    })
+
+    $('#set-team-name-modal').on('shown.bs.modal', function () {
+        $('#team-name').focus();
+    })
+
 });
\ No newline at end of file