diff --git a/readthedocs/projects/forms.py b/readthedocs/projects/forms.py
index 21e567f275a..82e36044282 100644
--- a/readthedocs/projects/forms.py
+++ b/readthedocs/projects/forms.py
@@ -4,7 +4,7 @@
 from urllib.parse import urlparse
 
 from crispy_forms.helper import FormHelper
-from crispy_forms.layout import Fieldset, Layout, HTML
+from crispy_forms.layout import Fieldset, Layout, HTML, Submit
 from django import forms
 from django.conf import settings
 from django.contrib.auth.models import User
@@ -239,6 +239,7 @@ def __init__(self, *args, **kwargs):
                 *self.Meta.per_version_settings,
             ),
         )
+        self.helper.add_input(Submit('save', _('Save')))
 
         default_choice = (None, '-' * 9)
         all_versions = self.instance.versions.values_list(
diff --git a/readthedocs/templates/projects/project_advanced.html b/readthedocs/templates/projects/project_advanced.html
index 2c946fdbed3..b2522581fe8 100644
--- a/readthedocs/templates/projects/project_advanced.html
+++ b/readthedocs/templates/projects/project_advanced.html
@@ -13,10 +13,5 @@
 {% block project_edit_content_header %}{% trans "Advanced Settings" %}{% endblock %}
 
 {% block project_edit_content %}
-  <form method="post" action=".">{% csrf_token %}
-    {% crispy form %}
-    <p>
-      <input style="display: inline;" type="submit" value="{% trans "Save" %}">
-    </p>
-  </form>
+  {% crispy form %}
 {% endblock %}