diff --git a/src/containers/blocks.jsx b/src/containers/blocks.jsx
index 7c757f392e94a8db2108ecea0f4cfc29e4ad0980..e038790e476b6924e01ecfe1ece0526297f49768 100644
--- a/src/containers/blocks.jsx
+++ b/src/containers/blocks.jsx
@@ -328,10 +328,7 @@ class Blocks extends React.Component {
             error.message = `Workspace Update Error: ${error.message}`;
             log.error(error);
         }
-        // All of the changes that happened during the load above are queued with
-        // timeouts, so re-enable the listener in the next tick, so it happens after
-        // the events are already fired.
-        setTimeout(() => this.workspace.addChangeListener(this.props.vm.blockListener));
+        this.workspace.addChangeListener(this.props.vm.blockListener);
 
         if (this.props.vm.editingTarget && this.state.workspaceMetrics[this.props.vm.editingTarget.id]) {
             const {scrollX, scrollY, scale} = this.state.workspaceMetrics[this.props.vm.editingTarget.id];