diff --git a/djadmin2/templates/admin2/bootstrap/model_add_form.html b/djadmin2/templates/admin2/bootstrap/model_add_form.html
index 6061116..ff42e50 100644
--- a/djadmin2/templates/admin2/bootstrap/model_add_form.html
+++ b/djadmin2/templates/admin2/bootstrap/model_add_form.html
@@ -9,6 +9,9 @@
 <form method="post">
     {% csrf_token %}
     {{ form.as_p }}
+
+    {# TODO: combine/refactor this with model_edit_form.html #}
+
     <button class="btn btn-small" type="submit" name="_addanother">Save and add another</button>
     <button class="btn btn-small" type="submit" name="_continue">Save and continue editing</button>
     <button class="btn btn-small btn-success" type="submit" name="_save">Save</button>
diff --git a/djadmin2/templates/admin2/bootstrap/model_edit_form.html b/djadmin2/templates/admin2/bootstrap/model_edit_form.html
index a130e31..abbdb52 100644
--- a/djadmin2/templates/admin2/bootstrap/model_edit_form.html
+++ b/djadmin2/templates/admin2/bootstrap/model_edit_form.html
@@ -11,7 +11,12 @@
         <form method="post">
             {% csrf_token %}
             {{ form.as_p }}
-            <input type="submit"/>
+
+            {# TODO: combine/refactor this with model_add_form.html #}
+
+            <button class="btn btn-small" type="submit" name="_addanother">Save and add another</button>
+            <button class="btn btn-small" type="submit" name="_continue">Save and continue editing</button>
+            <button class="btn btn-small btn-success" type="submit" name="_save">Save</button>
         </form>
     </div>
 </div>
diff --git a/djadmin2/views.py b/djadmin2/views.py
index 60c6c34..188fb75 100644
--- a/djadmin2/views.py
+++ b/djadmin2/views.py
@@ -77,6 +77,20 @@ class AdminModel2Mixin(Admin2Mixin, AccessMixin):
         return modelform_factory(self.get_model())
 
 
+class Admin2ModelFormMixin(object):
+
+    def get_success_url(self):
+        if '_continue' in self.request.POST:
+            view_name = admin2_urlname(self, 'update')
+            return reverse(view_name, kwargs={'pk': self.object.pk})
+
+        if '_addanother' in self.request.POST:
+            return reverse(admin2_urlname(self, 'create'))
+
+        # default to index view
+        return reverse(admin2_urlname(self, 'index'))
+
+
 class IndexView(Admin2Mixin, generic.TemplateView):
     default_template_name = "index.html"
     registry = None
@@ -107,14 +121,13 @@ class ModelDetailView(AdminModel2Mixin, generic.DetailView):
     permission_type = 'view'
 
 
-class ModelEditFormView(AdminModel2Mixin, generic.UpdateView):
+class ModelEditFormView(AdminModel2Mixin, Admin2ModelFormMixin, generic.UpdateView):
     form_class = None
-    success_url = "../../"
     default_template_name = "model_edit_form.html"
     permission_type = 'change'
 
 
-class ModelAddFormView(AdminModel2Mixin, generic.CreateView):
+class ModelAddFormView(AdminModel2Mixin, Admin2ModelFormMixin, generic.CreateView):
     form_class = None
     default_template_name = "model_add_form.html"
     permission_type = 'add'
@@ -124,17 +137,6 @@ class ModelAddFormView(AdminModel2Mixin, generic.CreateView):
         context['model'] = self.get_model()._meta.verbose_name
         return context
 
-    def get_success_url(self):
-        if '_continue' in self.request.POST:
-            view_name = admin2_urlname(self, 'update')
-            return reverse(view_name, kwargs={'pk': self.object.pk})
-
-        if '_addanother' in self.request.POST:
-            return reverse(admin2_urlname(self, 'create'))
-
-        # default to index view
-        return reverse(admin2_urlname(self, 'index'))
-
 
 class ModelDeleteView(AdminModel2Mixin, generic.DeleteView):
     success_url = "../../"