diff --git a/wax-prosemirror-components/src/components/comments/ConnectedComment.js b/wax-prosemirror-components/src/components/comments/ConnectedComment.js
index 6e12ec1cb5a666e632bb147dd07b778f64eafc4b..acb054b8940b4152e8bccea7de2a67356d9fe3d4 100644
--- a/wax-prosemirror-components/src/components/comments/ConnectedComment.js
+++ b/wax-prosemirror-components/src/components/comments/ConnectedComment.js
@@ -17,6 +17,7 @@ const ConnectedCommentStyled = styled.div`
 `;
 
 export default ({ comment, top, commentId, recalculateTops }) => {
+  const context = useContext(WaxContext);
   const {
     view,
     view: {
@@ -26,7 +27,7 @@ export default ({ comment, top, commentId, recalculateTops }) => {
     },
     app,
     activeView,
-  } = useContext(WaxContext);
+  } = context;
 
   const [isActive, setIsActive] = useState(false);
   const [clickPost, setClickPost] = useState(false);
@@ -93,6 +94,8 @@ export default ({ comment, top, commentId, recalculateTops }) => {
       return false;
     }
 
+    if (viewId !== 'main') context.updateView({}, viewId);
+
     const maxPos = maxBy(allCommentsWithSameId, 'pos');
     maxPos.pos += last(allCommentsWithSameId).node.nodeSize;
 
diff --git a/wax-prosemirror-components/src/components/trackChanges/ConnectedTrackChange.js b/wax-prosemirror-components/src/components/trackChanges/ConnectedTrackChange.js
index 6616cb7545d0c21e22ceec09d8b18aa79824cc65..b4e28d9e16c2b5a97b8179692b13e8156109f734 100644
--- a/wax-prosemirror-components/src/components/trackChanges/ConnectedTrackChange.js
+++ b/wax-prosemirror-components/src/components/trackChanges/ConnectedTrackChange.js
@@ -19,7 +19,8 @@ const ConnectedTrackChangeStyled = styled.div`
 `;
 
 export default ({ trackChangeId, top, recalculateTops, trackChange }) => {
-  const { app, activeView, view } = useContext(WaxContext);
+  const context = useContext(WaxContext);
+  const { app, activeView, view } = context;
   const user = app.config.get('user');
   const [isActive, setIsActive] = useState(false);
   const { state, dispatch } = activeView;
@@ -37,6 +38,8 @@ export default ({ trackChangeId, top, recalculateTops, trackChange }) => {
   const onClickBox = trackData => {
     if (trackData.node) return focusOnBlcock(trackData);
 
+    if (viewId !== 'main') context.updateView({}, viewId);
+
     const allTracksWithSameId = DocumentHelpers.findAllMarksWithSameId(
       view[viewId].state,
       trackData,