diff --git a/demo/main.js b/demo/main.js
index a5f8460e..fda6c809 100644
--- a/demo/main.js
+++ b/demo/main.js
@@ -37,7 +37,6 @@ optionElements.scrollback.addEventListener('change', function () {
 });
 optionElements.tabstopwidth.addEventListener('change', function () {
   term.setOption('tabStopWidth', parseInt(optionElements.tabstopwidth.value));
-  term.setupStops();
 });
 
 createTerminal();
diff --git a/src/xterm.js b/src/xterm.js
index 3c205adb..9e44f24f 100644
--- a/src/xterm.js
+++ b/src/xterm.js
@@ -434,6 +434,7 @@ Terminal.prototype.setOption = function(key, value) {
       this.element.classList.toggle(`xterm-cursor-style-underline`, value === 'underline');
       this.element.classList.toggle(`xterm-cursor-style-bar`, value === 'bar');
       break;
+    case 'tabStopWidth': this.setupStops(); break;
   }
 };