diff --git a/app/assets/javascripts/room.js b/app/assets/javascripts/room.js
index 1a80be95..4b762e04 100644
--- a/app/assets/javascripts/room.js
+++ b/app/assets/javascripts/room.js
@@ -51,6 +51,13 @@ $(document).on('turbolinks:load', function(){
     })
   }
 
+    // Autofocus on the Room Name label when creating a room only
+  $('#createRoomModal').on('shown.bs.modal', function (){
+    if ($(".create-only").css("display") == "block"){
+      $('#create-room-name').focus()
+    }
+  })
+  
   if (controller == "rooms" && action == "show" || controller == "admins" && action == "server_rooms"){
     // Display and update all fields related to creating a room in the createRoomModal
     $(".update-room").click(function(){