diff --git a/js/Marquee.jsx b/js/Marquee.jsx
index 2f06277c..cae6b5cf 100644
--- a/js/Marquee.jsx
+++ b/js/Marquee.jsx
@@ -14,7 +14,9 @@ class Marquee extends React.Component {
   componentDidMount() {
     const step = () => {
       setTimeout(() => {
-        this.props.dispatch({type: 'STEP_MARQUEE'});
+        if (this.props.stepping) {
+          this.props.dispatch({type: 'STEP_MARQUEE'});
+        }
         step();
       }, 220);
     };
diff --git a/js/reducers.js b/js/reducers.js
index 327a7abd..08c45fa6 100644
--- a/js/reducers.js
+++ b/js/reducers.js
@@ -36,14 +36,8 @@ const marquee = (state, action) => {
       ]
     };
   }
+  state = Object.assign({}, state, {registers: state.registers.map(r => register(r, action))});
   switch (action.type) {
-    case 'SET_MARQUEE_REGISTER':
-      return Object.assign({}, state, {registers: state.registers.map(r => register(r, action))});
-    case 'STEP_MARQUEE':
-      if (state.stepping) {
-        return Object.assign({}, state, {registers: state.registers.map(r => register(r, action))});
-      }
-      return state;
     case 'SHOW_MARQUEE_REGISTER':
       if (state.stepping) {
         return Object.assign({}, state, {selectedRegister: action.register});