diff --git a/core/client/app/components/gh-spin-button.js b/core/client/app/components/gh-spin-button.js
index ac9bb6f8d5..f487964c9c 100644
--- a/core/client/app/components/gh-spin-button.js
+++ b/core/client/app/components/gh-spin-button.js
@@ -4,6 +4,7 @@ export default Ember.Component.extend({
     tagName: 'button',
     buttonText: '',
     submitting: false,
+    showSpinner: false,
     autoWidth: true,
 
     // Disable Button when isLoading equals true
@@ -20,19 +21,14 @@ export default Ember.Component.extend({
         return true;
     },
 
-    setSize: function () {
-        if (!this.get('submitting') && this.get('autoWidth')) {
-            // this exists so that the spinner doesn't change the size of the button
-            this.$().width(this.$().width()); // sets width of button
-            this.$().height(this.$().height()); // sets height of button
+    setSize: Ember.observer('submitting', function () {
+        if (this.get('submitting') && this.get('autoWidth')) {
+            this.$().width(this.$().width());
+            this.$().height(this.$().height());
+        } else {
+            this.$().width('');
+            this.$().height('');
         }
-    },
-
-    width: Ember.observer('buttonText', 'autoWidth', function () {
-        this.setSize();
-    }),
-
-    didInsertElement: function () {
-        this.setSize();
-    }
+        this.set('showSpinner', this.get('submitting'));
+    })
 });
diff --git a/core/client/app/templates/components/gh-spin-button.hbs b/core/client/app/templates/components/gh-spin-button.hbs
index a18aecf6da..eb93ed58a1 100644
--- a/core/client/app/templates/components/gh-spin-button.hbs
+++ b/core/client/app/templates/components/gh-spin-button.hbs
@@ -1,9 +1,9 @@
-{{#unless submitting}}
+{{#if showSpinner}}
+    <span class="spinner"></span>
+{{else}}
     {{#if buttonText}}
         {{buttonText}}
     {{else}}
         {{{yield}}}
     {{/if}}
-{{else}}
-    <span class="spinner"></span>
-{{/unless}}
+{{/if}}
\ No newline at end of file