diff --git a/wax-prosemirror-components/src/components/comments/ConnectedComment.js b/wax-prosemirror-components/src/components/comments/ConnectedComment.js
index 23269d7894fa3f31788b812ee006d757c32c412b..d7d2413ad2f98815406f6413c2f95c7d70d4c2be 100644
--- a/wax-prosemirror-components/src/components/comments/ConnectedComment.js
+++ b/wax-prosemirror-components/src/components/comments/ConnectedComment.js
@@ -50,9 +50,10 @@ export default ({ comment, top, commentId, recalculateTops }) => {
 
   const commentPlugin = app.PmPlugins.get('commentPlugin');
   const activeComment = commentPlugin.getState(activeView.state).comment;
-
+  console.log(activeComment);
   useEffect(() => {
     setIsActive(false);
+    recalculateTops();
     if (activeComment && commentId === activeComment.attrs.id) {
       setIsActive(true);
       recalculateTops();
@@ -138,7 +139,7 @@ export default ({ comment, top, commentId, recalculateTops }) => {
         onClickResolve();
         activeView.focus();
       }
-    }, 200);
+    }, 400);
   };
 
   const MemorizedComponent = useMemo(
diff --git a/wax-prosemirror-components/src/components/trackChanges/ConnectedTrackChange.js b/wax-prosemirror-components/src/components/trackChanges/ConnectedTrackChange.js
index cc2972a118bdfdf0ee90cbb7c31d74134be54ecb..6616cb7545d0c21e22ceec09d8b18aa79824cc65 100644
--- a/wax-prosemirror-components/src/components/trackChanges/ConnectedTrackChange.js
+++ b/wax-prosemirror-components/src/components/trackChanges/ConnectedTrackChange.js
@@ -67,6 +67,7 @@ export default ({ trackChangeId, top, recalculateTops, trackChange }) => {
 
   useEffect(() => {
     setIsActive(false);
+    recalculateTops();
     if (activeTrackChange && trackChangeId === activeTrackChange.attrs.id) {
       setIsActive(true);
       recalculateTops();