diff --git a/core/client/app/components/gh-spin-button.js b/core/client/app/components/gh-spin-button.js
index bd2678a388..4765313123 100644
--- a/core/client/app/components/gh-spin-button.js
+++ b/core/client/app/components/gh-spin-button.js
@@ -31,8 +31,8 @@ export default Ember.Component.extend({
             this.set('showSpinnerTimeout', Ember.run.later(this, function () {
                 if (!this.get('submitting')) {
                     this.set('showSpinner', false);
-                    this.set('showSpinnerTimeout', null);
                 }
+                this.set('showSpinnerTimeout', null);
             }, 1000));
         } else if (!submitting && timeout === null) {
             this.set('showSpinner', false);