diff --git a/wax-prosemirror-components/src/components/trackChanges/ConnectedTrackChange.js b/wax-prosemirror-components/src/components/trackChanges/ConnectedTrackChange.js
index 4180dadda499672da9e4f36c9c30c7fa463df5bc..5ab5833e3c415f9bee872edfc0c9738d03f5d8dd 100644
--- a/wax-prosemirror-components/src/components/trackChanges/ConnectedTrackChange.js
+++ b/wax-prosemirror-components/src/components/trackChanges/ConnectedTrackChange.js
@@ -33,6 +33,8 @@ export default ({ trackChangeId, top, recalculateTops, trackChange }) => {
     .trackChange;
 
   const onClickBox = trackData => {
+    if (trackData.node) return focusOnBlcock(trackData);
+
     const allTracksWithSameId = DocumentHelpers.findAllMarksWithSameId(
       view[viewId].state,
       trackData,
@@ -50,6 +52,17 @@ export default ({ trackChangeId, top, recalculateTops, trackChange }) => {
     return true;
   };
 
+  const focusOnBlcock = trackData => {
+    view[viewId].dispatch(
+      view[viewId].state.tr.setSelection(
+        new TextSelection(view[viewId].state.tr.doc.resolve(trackData.pos + 1)),
+      ),
+    );
+
+    view[viewId].focus();
+    return true;
+  };
+
   useEffect(() => {
     setIsActive(false);
     if (activeTrackChange && trackChangeId === activeTrackChange.attrs.id) {
diff --git a/wax-prosemirror-components/src/components/trackChanges/TrackChangesBox.js b/wax-prosemirror-components/src/components/trackChanges/TrackChangesBox.js
index 24436afaed1afc26e85cdb72fec14075d25fe7e3..dc944776207fd6e2d3d2386b6cd97dcf5e62d30f 100644
--- a/wax-prosemirror-components/src/components/trackChanges/TrackChangesBox.js
+++ b/wax-prosemirror-components/src/components/trackChanges/TrackChangesBox.js
@@ -146,7 +146,6 @@ const TrackChangesBox = props => {
   }
 
   if (trackData.node) {
-    console.log(trackData);
     const track = trackData.node.attrs.track[0];
     if (track.type === 'insertion') {
       textBlockInsert = trackData.node.type.name;