diff --git a/r2/r2/public/static/css/wiki.less b/r2/r2/public/static/css/wiki.less
index 47d42e707..7090ae37f 100644
--- a/r2/r2/public/static/css/wiki.less
+++ b/r2/r2/public/static/css/wiki.less
@@ -152,7 +152,11 @@
         .wiki_button {
             padding: 2px;
         }
-        
+
+        .throbber {
+            margin-bottom: -5px;
+        }
+
         // Submit Discussion button 
         .discussionlink {
             display: inline-block;
diff --git a/r2/r2/public/static/js/wiki.js b/r2/r2/public/static/js/wiki.js
index 27fc06c50..aefe7e15e 100644
--- a/r2/r2/public/static/js/wiki.js
+++ b/r2/r2/public/static/js/wiki.js
@@ -90,12 +90,14 @@ r.wiki = {
         special.hide()
         params = r.utils.serializeForm($this)
         $('#wiki_save_button').attr("disabled", true)
+        $this.addClass("working")
         r.wiki.request({
             url: url,
             type: 'POST',
             dataType: 'json',
             data: params,
             error: function() {
+                $this.removeClass("working")
                 $('#wiki_save_button').removeAttr("disabled")
             },
             success: function() {
diff --git a/r2/r2/templates/wikieditpage.html b/r2/r2/templates/wikieditpage.html
index 5e647bc29..bee82c509 100644
--- a/r2/r2/templates/wikieditpage.html
+++ b/r2/r2/templates/wikieditpage.html
@@ -45,4 +45,5 @@
     <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" id="wiki_save_button" class="wiki_button" value="${_('save page')}" />
+    <span class="throbber" />
 </form>