diff --git a/ui/CommandManager.js b/ui/CommandManager.js
index <HASH>..<HASH> 100644
--- a/ui/CommandManager.js
+++ b/ui/CommandManager.js
@@ -29,7 +29,7 @@ export default class CommandManager {
     this._initialize()
 
     // on any update we will recompute
-    this.editorSession.onUpdate(this._onSessionUpdate, this)
+    this.editorSession.on('pre-render', this._onSessionUpdate, this)
 
     // compute initial command states and
     // promote to editorSession
Update CommandManager on 'pre-render'

Because it depends on everything which should be done
as model or state update, but before any tool is rendered.