diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/generic/create.html b/wagtail/wagtailadmin/templates/wagtailadmin/generic/create.html
index 89d1b6b1f..1536c1b09 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/generic/create.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/generic/create.html
@@ -9,9 +9,17 @@
 
     <form action="{{ view.get_add_url }}" method="POST">
         {% csrf_token %}
+
+        {% block hidden_fields %}
+            {% for field in form.hidden_fields %}{{ field }}{% endfor %}
+        {% endblock %}
+
         <div class="nice-padding">
             <ul class="fields">
                 {% block form %}
+                    {% for field in form.visible_fields %}
+                        {% include "wagtailadmin/shared/field_as_li.html" %}
+                    {% endfor %}
                 {% endblock %}
                 <li><input type="submit" value="{% trans 'Save' %}" /></li>
             </ul>
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/generic/edit.html b/wagtail/wagtailadmin/templates/wagtailadmin/generic/edit.html
index cbc5ff7eb..46d0e0224 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/generic/edit.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/generic/edit.html
@@ -10,9 +10,16 @@
     <div class="nice-padding">
         <form action="{{ view.get_edit_url }}" method="POST">
             {% csrf_token %}
-        
+
+            {% block hidden_fields %}
+                {% for field in form.hidden_fields %}{{ field }}{% endfor %}
+            {% endblock %}
+
             <ul class="fields">
                 {% block form %}
+                    {% for field in form.visible_fields %}
+                        {% include "wagtailadmin/shared/field_as_li.html" %}
+                    {% endfor %}
                 {% endblock %}
                 
                 <li>
diff --git a/wagtail/wagtailsites/templates/wagtailsites/_form.html b/wagtail/wagtailsites/templates/wagtailsites/_form.html
deleted file mode 100644
index 694ea4a00..000000000
--- a/wagtail/wagtailsites/templates/wagtailsites/_form.html
+++ /dev/null
@@ -1,4 +0,0 @@
-{% include "wagtailadmin/shared/field_as_li.html" with field=form.hostname %}
-{% include "wagtailadmin/shared/field_as_li.html" with field=form.port %}
-{% include "wagtailadmin/shared/field_as_li.html" with field=form.root_page %}
-{% include "wagtailadmin/shared/field_as_li.html" with field=form.is_default_site %}
diff --git a/wagtail/wagtailsites/templates/wagtailsites/create.html b/wagtail/wagtailsites/templates/wagtailsites/create.html
index eebe065dd..df830c2af 100644
--- a/wagtail/wagtailsites/templates/wagtailsites/create.html
+++ b/wagtail/wagtailsites/templates/wagtailsites/create.html
@@ -1,9 +1,5 @@
 {% extends "wagtailadmin/generic/create.html" %}
 
-{% block form %}
-    {% include "wagtailsites/_form.html" %}
-{% endblock %}
-
 {% block extra_js %}
     {% include "wagtailadmin/pages/_editor_js.html" %}
 {% endblock %}
diff --git a/wagtail/wagtailsites/templates/wagtailsites/edit.html b/wagtail/wagtailsites/templates/wagtailsites/edit.html
index e8c6898a9..14e9c29f0 100644
--- a/wagtail/wagtailsites/templates/wagtailsites/edit.html
+++ b/wagtail/wagtailsites/templates/wagtailsites/edit.html
@@ -1,9 +1,5 @@
 {% extends "wagtailadmin/generic/edit.html" %}
 
-{% block form %}
-    {% include "wagtailsites/_form.html" %}
-{% endblock %}
-
 {% block extra_js %}
     {% include "wagtailadmin/pages/_editor_js.html" %}
 {% endblock %}