diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Firewall/forms/categoryEdit.xml b/src/opnsense/mvc/app/controllers/OPNsense/Firewall/forms/categoryEdit.xml
index cfa4b4c49..5a90e32ec 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Firewall/forms/categoryEdit.xml
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Firewall/forms/categoryEdit.xml
@@ -5,12 +5,6 @@
         <type>checkbox</type>
         <help>Automatically added, will be removed when unused</help>
     </field>
-    <field>
-        <id>category.name</id>
-        <label>Name</label>
-        <type>text</type>
-        <help>Enter a name for this category.</help>
-    </field>
     <field>
         <id>category.color</id>
         <label>Color</label>
@@ -18,4 +12,10 @@
         <style>pick-a-color</style>
         <help>pick a color to use.</help>
     </field>
+    <field>
+        <id>category.name</id>
+        <label>Name</label>
+        <type>text</type>
+        <help>Enter a name for this category.</help>
+    </field>
 </form>
diff --git a/src/opnsense/mvc/app/views/OPNsense/Firewall/category.volt b/src/opnsense/mvc/app/views/OPNsense/Firewall/category.volt
index e6a1b13d2..01b156f79 100644
--- a/src/opnsense/mvc/app/views/OPNsense/Firewall/category.volt
+++ b/src/opnsense/mvc/app/views/OPNsense/Firewall/category.volt
@@ -85,6 +85,11 @@
 
 </script>
 
+<style>
+    .modal-body {
+        min-height: 410px;
+    }
+</style>
 
 <ul class="nav nav-tabs" data-tabs="tabs" id="maintabs">
     <li class="active"><a data-toggle="tab" href="#grid-categories">{{ lang._('Categories') }}</a></li>