diff --git a/wax-prosemirror-components/src/components/trackChanges/ConnectedTrackChange.js b/wax-prosemirror-components/src/components/trackChanges/ConnectedTrackChange.js
index 52137326b406cd1e0d2198c717adbe41da4b3b13..c5c7c215f11480d7ba06607678bb8b4ed5dfa5ff 100644
--- a/wax-prosemirror-components/src/components/trackChanges/ConnectedTrackChange.js
+++ b/wax-prosemirror-components/src/components/trackChanges/ConnectedTrackChange.js
@@ -1,8 +1,10 @@
 /* eslint react/prop-types: 0 */
 import React, { useContext, useMemo, useState, useEffect } from 'react';
 import styled from 'styled-components';
-// import { DocumentHelpers } from 'wax-prosemirror-utilities';
+import { DocumentHelpers } from 'wax-prosemirror-utilities';
 import { WaxContext } from 'wax-prosemirror-core';
+import { last, maxBy } from 'lodash';
+import { TextSelection } from 'prosemirror-state';
 import TrackChangesBox from './TrackChangesBox';
 
 const ConnectedTrackChangeStyled = styled.div`
@@ -14,11 +16,11 @@ const ConnectedTrackChangeStyled = styled.div`
 `;
 
 export default ({ trackChangeId, top, recalculateTops, trackChange }) => {
-  const { app, activeView } = useContext(WaxContext);
+  const { app, activeView, view } = useContext(WaxContext);
 
   const [isActive, setIsActive] = useState(false);
   // const { state, dispatch } = activeView;
-
+  const viewId = 'main';
   const styles = {
     top: `${top}px`,
   };
@@ -27,6 +29,26 @@ export default ({ trackChangeId, top, recalculateTops, trackChange }) => {
   const activeTrackChange = trakChangePlugin.getState(activeView.state)
     .trackChange;
 
+  const onClickBox = trackData => {
+    const allTracksWithSameId = DocumentHelpers.findAllMarksWithSameId(
+      view[viewId].state,
+      trackData,
+    );
+    const maxPos = maxBy(allTracksWithSameId, 'pos');
+    maxPos.pos += last(allTracksWithSameId).node.nodeSize;
+
+    view[viewId].dispatch(
+      view[viewId].state.tr.setSelection(
+        new TextSelection(
+          view[viewId].state.tr.doc.resolve(maxPos.pos, maxPos.pos),
+        ),
+      ),
+    );
+
+    view[viewId].focus();
+    return true;
+  };
+
   useEffect(() => {
     setIsActive(false);
     if (activeTrackChange && trackChangeId === activeTrackChange.attrs.id) {
@@ -45,6 +67,7 @@ export default ({ trackChangeId, top, recalculateTops, trackChange }) => {
         <TrackChangesBox
           active={isActive}
           key={trackChangeId}
+          onClickBox={onClickBox}
           recalculateTops={recalculateTops}
           trackChangeId={trackChangeId}
           trackData={trackChange}
diff --git a/wax-prosemirror-components/src/components/trackChanges/TrackChangesBox.js b/wax-prosemirror-components/src/components/trackChanges/TrackChangesBox.js
index 8fff54d83e5a18ab2099dcdbef85d307e13958ce..594086807f1359c0a3e87ee0c4a6186968e5cbdf 100644
--- a/wax-prosemirror-components/src/components/trackChanges/TrackChangesBox.js
+++ b/wax-prosemirror-components/src/components/trackChanges/TrackChangesBox.js
@@ -91,15 +91,20 @@ const TrackChangesBox = props => {
     active,
     className,
     label,
-    onClick,
+    onClickBox,
     onClickAccept,
     onClickReject,
     text,
     trackData,
   } = props;
-  //   console.log(trackData);
+
+  const onClickTrackBox = () => {
+    console.log(onClickBox);
+    onClickBox(trackData);
+  };
+
   return (
-    <Wrapper active={active} className={className} onClick={onClick}>
+    <Wrapper active={active} className={className} onClick={onClickTrackBox}>
       <HeadWrapper>
         <Info>
           <Name>{trackData.attrs.username}</Name>