diff --git a/src/servala/core/crd.py b/src/servala/core/crd.py
index f356c7b..719b79a 100644
--- a/src/servala/core/crd.py
+++ b/src/servala/core/crd.py
@@ -191,12 +191,17 @@ class CrdModelFormMixin:
             field_name
             for field_name, field in self.fields.items()
             if not field_name.startswith("spec.")
-            and not isinstance(field.widget, forms.HiddenInput)
         ]
         if general_fields:
-            fieldsets.append(
-                {"title": "General", "fields": general_fields, "fieldsets": []}
-            )
+            fieldset = {"title": "General", "fields": general_fields, "fieldsets": []}
+            if all(
+                [
+                    isinstance(self.fields[field].widget, forms.HiddenInput)
+                    for field in general_fields
+                ]
+            ):
+                fieldset["hidden"] = True
+            fieldsets.append(fieldset)
 
         # Process spec fields
         others = []
diff --git a/src/servala/frontend/templates/includes/tabbed_fieldset_form.html b/src/servala/frontend/templates/includes/tabbed_fieldset_form.html
index 387f7a6..c9abe55 100644
--- a/src/servala/frontend/templates/includes/tabbed_fieldset_form.html
+++ b/src/servala/frontend/templates/includes/tabbed_fieldset_form.html
@@ -6,23 +6,25 @@
     {% csrf_token %}
     <ul class="nav nav-tabs" id="myTab" role="tablist">
         {% for fieldset in form.get_fieldsets %}
-            <li class="nav-item" role="presentation">
-                <button class="nav-link {% if forloop.first %}active{% endif %}"
-                        id="{{ fieldset.title|slugify }}-tab"
-                        data-bs-toggle="tab"
-                        data-bs-target="#{{ fieldset.title|slugify }}"
-                        type="button"
-                        role="tab"
-                        aria-controls="{{ fieldset.title|slugify }}"
-                        aria-selected="{% if forloop.first %}true{% else %}false{% endif %}">
-                    {{ fieldset.title }}
-                </button>
-            </li>
+            {% if not fieldset.hidden %}
+                <li class="nav-item" role="presentation">
+                    <button class="nav-link {% if forloop.first %}active{% endif %}"
+                            id="{{ fieldset.title|slugify }}-tab"
+                            data-bs-toggle="tab"
+                            data-bs-target="#{{ fieldset.title|slugify }}"
+                            type="button"
+                            role="tab"
+                            aria-controls="{{ fieldset.title|slugify }}"
+                            aria-selected="{% if forloop.first %}true{% else %}false{% endif %}">
+                        {{ fieldset.title }}
+                    </button>
+                </li>
+            {% endif %}
         {% endfor %}
     </ul>
     <div class="tab-content" id="myTabContent">
         {% for fieldset in form.get_fieldsets %}
-            <div class="tab-pane fade my-2 {% if forloop.first %}show active{% endif %}"
+            <div class="tab-pane fade my-2 {% if fieldset.hidden %}d-none{% endif %}{% if forloop.first %}show active{% endif %}"
                  id="{{ fieldset.title|slugify }}"
                  role="tabpanel"
                  aria-labelledby="{{ fieldset.title|slugify }}-tab">