diff --git a/app/components/SimpleEditor/Editor.js b/app/components/SimpleEditor/Editor.js
index 66c140bfe0a0248383e8805946b60ad8429e8984..043f64e3ea763edd91a44911e4cd387b14683382 100644
--- a/app/components/SimpleEditor/Editor.js
+++ b/app/components/SimpleEditor/Editor.js
@@ -22,13 +22,15 @@ class Editor extends ProseEditor {
       'showComments': function () { this.toggleCommentsArea(true) },
       'hideComments': function () { this.toggleCommentsArea(false) },
       'trackChangesUpdate': function () { this.updateTrackChange() },
-      'domSelectionRendered': function () { this.domSelectionRendered() }
+      'trackChangesViewToggle': function () { this.trackChangesViewToggle() }
     })
   }
 
-  domSelectionRendered () {
+  trackChangesViewToggle () {
     // TODO what to handle here????
-    // console.log('rendered')
+    this.extendState({
+      trackChangesView: !this.state.trackChangesView
+    })
   }
 
   updateTrackChange () {
@@ -149,6 +151,7 @@ class Editor extends ProseEditor {
     $$(Toolbar, {
       commandStates: commandStates,
       trackChanges: this.props.trackChanges,
+      trackChangesView: this.state.trackChangesView,
       toolGroups: ['text', 'document', 'annotations', 'default', 'track-change-enable', 'track-change-toggle-view']
     }).ref('toolbar')
   )
diff --git a/app/components/SimpleEditor/elements/track_change/TrackChangeControlViewCommand.js b/app/components/SimpleEditor/elements/track_change/TrackChangeControlViewCommand.js
index def9e7fd803b3dac99c6901ed37f52347251fdfa..829964d86210160e0f1ef70269cf2eeeef24d5d3 100644
--- a/app/components/SimpleEditor/elements/track_change/TrackChangeControlViewCommand.js
+++ b/app/components/SimpleEditor/elements/track_change/TrackChangeControlViewCommand.js
@@ -13,7 +13,7 @@ class TrackChangeControlViewCommand extends Command {
   // TODO -- review
   execute (params, context) {
     const surface = context.surfaceManager.getSurface('body')
-    surface.send('trackChangesViewUpdate')
+    surface.send('trackChangesViewToggle')
     surface.rerender()
     return true
   }
diff --git a/app/components/SimpleEditor/elements/track_change/TrackChangeControlViewTool.js b/app/components/SimpleEditor/elements/track_change/TrackChangeControlViewTool.js
index 59b8ca3bac7e5c9d557176156d0934fa8968a1d2..a9a01c29c00c7a116f96bf6c916696a871b2e444 100644
--- a/app/components/SimpleEditor/elements/track_change/TrackChangeControlViewTool.js
+++ b/app/components/SimpleEditor/elements/track_change/TrackChangeControlViewTool.js
@@ -2,9 +2,6 @@ import { Tool } from 'substance'
 
 class TrackChangeControlViewTool extends Tool {
 
-  getClassNames () {
-    return 'sm-target-track-change-toggle-view'
-  }
   renderButton ($$) {
     const el = super.renderButton($$)
     if (this.getViewMode()) el.addClass('track-changes-view-active')
@@ -18,9 +15,9 @@ class TrackChangeControlViewTool extends Tool {
   }
 
   getViewMode () {
-    const editor = this.context.controller
-    var trackChangesView = true
-    // const { trackChangesView } = editor.state
+    const editor = this.context.editor
+
+    const { trackChangesView } = editor.state
     return trackChangesView
   }
 }