diff --git a/src/webui/www/private/newcategory.html b/src/webui/www/private/newcategory.html
index 7e5c5dae9..f7d9a36bc 100644
--- a/src/webui/www/private/newcategory.html
+++ b/src/webui/www/private/newcategory.html
@@ -35,10 +35,7 @@
             var uriCategoryName = safeTrim(new URI().getData('categoryName'));
             var uriSavePath = safeTrim(new URI().getData('savePath'));
 
-            if (uriAction === "create") {
-                $('categoryName').focus();
-            }
-            else if (uriAction === "edit") {
+            if (uriAction === "edit") {
                 if (!uriCategoryName)
                     return false;
 
@@ -47,6 +44,9 @@
                 $('savePath').set('value', escapeHtml(uriSavePath));
                 $('savePath').focus();
             }
+            else {
+                $('categoryName').focus();
+            }
 
             $('categoryNameButton').addEvent('click', function(e) {
                 new Event(e).stop();