diff --git a/static/js/channels.js b/static/js/channels.js
index 50146146..90110bca 100644
--- a/static/js/channels.js
+++ b/static/js/channels.js
@@ -26,6 +26,10 @@ $(function() {
         return false;
     });
 
+    $(".channel-modal").on('shown.bs.modal', function () {
+        $(".input-name", this).focus();
+    })
+
     $('[data-toggle="tooltip"]').tooltip();
 
 });
\ No newline at end of file