diff --git a/src/main/resources/static/js/templates.js b/src/main/resources/static/js/templates.js
index 19ae74af4d2c1af69d4db00f2a0db91d287f2b2e..13d3df6e8ed10a25cb450665eb247f4efa3f0b4f 100644
--- a/src/main/resources/static/js/templates.js
+++ b/src/main/resources/static/js/templates.js
@@ -44,6 +44,11 @@ $(document).ready(function()
             searchTemplates(searchText);
         });
     }
+
+    if($("#template-name").length)
+    {
+        document.getElementById('template-name').focus();
+    }
 });
 
 function createAndOpenModal(data)