diff --git a/GCDWebUploader/GCDWebUploader.bundle/js/index.js b/GCDWebUploader/GCDWebUploader.bundle/js/index.js
index 45bc49f..86b6e3f 100644
--- a/GCDWebUploader/GCDWebUploader.bundle/js/index.js
+++ b/GCDWebUploader/GCDWebUploader.bundle/js/index.js
@@ -202,13 +202,14 @@ $(document).ready(function() {
     
   });
   
+  $("#create-modal").on("shown.bs.modal", function(event) {
+    $("#create-input").focus();
+    $("#create-input").select();
+  })
+  
   $("#create-folder").click(function(event) {
     $("#create-input").val("Untitled folder");
     $("#create-modal").modal("show");
-    $("#create-modal").on("shown.bs.modal", function(event) {
-      $("#create-input").focus();
-      $("#create-input").select();
-    })
   });
   
   $("#create-confirm").click(function(event) {