diff --git a/js/components/toggler.js b/js/components/toggler.js
index 0b68a97f..6c493863 100644
--- a/js/components/toggler.js
+++ b/js/components/toggler.js
@@ -1,12 +1,10 @@
-import FormMixin from '../mixins/form'
 import optionsinput from './options_input'
 import textinput from './text_input'
+import BaseForm from './forms/base_form'
 
 export default {
   name: 'toggler',
 
-  mixins: [FormMixin],
-
   props: {
     initialSelectedSection: {
       type: String,
@@ -18,6 +16,7 @@ export default {
     optionsinput,
     textinput,
     optionsinput,
+    BaseForm,
     toggler: this,
   },
 
diff --git a/templates/applications/fragments/environments.html b/templates/applications/fragments/environments.html
index a3e420ad..23fa6f82 100644
--- a/templates/applications/fragments/environments.html
+++ b/templates/applications/fragments/environments.html
@@ -78,15 +78,17 @@
                     {% call ToggleSection(section_name="edit") %}
                       <ul>
                         <li class="accordion-table__item-toggle-content__expanded">
-                          <form action="{{ url_for('applications.update_environment', environment_id=env['id']) }}" method="post" v-on:submit="handleSubmit">
-                            {{ edit_form.csrf_token }}
-                            {{ TextInput(edit_form.name, validation='requiredField', optional=False) }}
-                            {{
-                              SaveButton(
-                                text=("common.save" | translate)
-                              )
-                            }}
-                          </form>
+                          <base-form inline-template>
+                            <form action="{{ url_for('applications.update_environment', environment_id=env['id']) }}" method="post" v-on:submit="handleSubmit">
+                              {{ edit_form.csrf_token }}
+                              {{ TextInput(edit_form.name, validation='requiredField', optional=False) }}
+                              {{
+                                SaveButton(
+                                  text=("common.save" | translate)
+                                )
+                              }}
+                            </form>
+                          </base-form>
                         </li>
                       </ul>
                     {% endcall %}