diff --git a/r2/r2/public/static/js/wiki.js b/r2/r2/public/static/js/wiki.js
index 2c22054b4..27fc06c50 100644
--- a/r2/r2/public/static/js/wiki.js
+++ b/r2/r2/public/static/js/wiki.js
@@ -89,11 +89,15 @@ r.wiki = {
         conflict.hide()
         special.hide()
         params = r.utils.serializeForm($this)
+        $('#wiki_save_button').attr("disabled", true)
         r.wiki.request({
             url: url,
             type: 'POST',
             dataType: 'json',
             data: params,
+            error: function() {
+                $('#wiki_save_button').removeAttr("disabled")
+            },
             success: function() {
                 window.location = r.wiki.baseUrl() + '/' + r.config.wiki_page
             },
diff --git a/r2/r2/templates/wikieditpage.html b/r2/r2/templates/wikieditpage.html
index 3f2c4fa1d..5e647bc29 100644
--- a/r2/r2/templates/wikieditpage.html
+++ b/r2/r2/templates/wikieditpage.html
@@ -44,5 +44,5 @@
     <label for="reason">${_("reason for revision")}</label><br/>
     <input type="text" name="reason" maxlength="256" id="wiki_revision_reason" />
     <input type="hidden" id="previous" name="previous" value="${thing.previous}" />
-    <br/><br/><input type="submit" class="wiki_button" value="${_('save page')}" />
+    <br/><br/><input type="submit" id="wiki_save_button" class="wiki_button" value="${_('save page')}" />
 </form>