diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 249a933f..f2aaf1e2 100755
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -62,9 +62,6 @@ $(document).ready(function() {
       clearButton: true,
       date: false
   });
-
-  // first input focus for all form
-  $("body").has("form").find("input:first").focus();
   
   // Image Upload
   $("#simple_menu_item_image_path").fileinput({
@@ -107,6 +104,7 @@ $(document).ready(function() {
     }
   });
 
+  // first input focus for all form
   $('form:first *:input[type!=hidden]:first').focus();
 
 // $(document).on("focus", "[data-behaviour~='datepicker']", function(e){