diff --git a/app/Templates/category_edit.php b/app/Templates/category_edit.php
index 1339f6da2..327acce64 100644
--- a/app/Templates/category_edit.php
+++ b/app/Templates/category_edit.php
@@ -13,7 +13,7 @@
         <?= Helper\form_hidden('project_id', $values) ?>
 
         <?= Helper\form_label(t('Category Name'), 'name') ?>
-        <?= Helper\form_text('name', $values, $errors, array('required')) ?>
+        <?= Helper\form_text('name', $values, $errors, array('autofocus required')) ?>
 
         <div class="form-actions">
             <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
diff --git a/app/Templates/category_index.php b/app/Templates/category_index.php
index 7fb923bae..18e81b784 100644
--- a/app/Templates/category_index.php
+++ b/app/Templates/category_index.php
@@ -38,7 +38,7 @@
         <?= Helper\form_hidden('project_id', $values) ?>
 
         <?= Helper\form_label(t('Category Name'), 'name') ?>
-        <?= Helper\form_text('name', $values, $errors, array('required')) ?>
+        <?= Helper\form_text('name', $values, $errors, array('autofocus required')) ?>
 
         <div class="form-actions">
             <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>