diff --git a/core/Resources/views/admin/crud/edit.html.twig b/core/Resources/views/admin/crud/edit.html.twig
index d74c15c..8fae116 100644
--- a/core/Resources/views/admin/crud/edit.html.twig
+++ b/core/Resources/views/admin/crud/edit.html.twig
@@ -70,7 +70,9 @@
             <div class="tab-content">
                 <div class="tab-pane active">
                     <div class="tab-form">
-                        {{ include(configuration.view('form', '@Core/admin/crud/_form.html.twig')) }}
+                        {% include(configuration.view('form', '@Core/admin/crud/_form.html.twig')) with {form: form} %}
+
+                        {{ form_rest(form) }}
                     </div>
                 </div>
             </div>
diff --git a/core/Resources/views/admin/crud/new.html.twig b/core/Resources/views/admin/crud/new.html.twig
index 6d5610d..d4c7b5b 100644
--- a/core/Resources/views/admin/crud/new.html.twig
+++ b/core/Resources/views/admin/crud/new.html.twig
@@ -36,12 +36,12 @@
             <div class="tab-content">
                 <div class="tab-pane active">
                     <div class="tab-form">
-                        {{ include(configuration.view('form', '@Core/admin/crud/_form.html.twig')) }}
+                        {% include(configuration.view('form', '@Core/admin/crud/_form.html.twig')) %}
+
+                        {{ form_rest(form) }}
                     </div>
                 </div>
             </div>
-
-            {{ form_rest(form) }}
         </form>
     {% endblock %}
 {% endblock %}