diff --git a/wax-prosemirror-components/src/components/comments/ConnectedComment.js b/wax-prosemirror-components/src/components/comments/ConnectedComment.js
index d7d2413ad2f98815406f6413c2f95c7d70d4c2be..6e12ec1cb5a666e632bb147dd07b778f64eafc4b 100644
--- a/wax-prosemirror-components/src/components/comments/ConnectedComment.js
+++ b/wax-prosemirror-components/src/components/comments/ConnectedComment.js
@@ -50,7 +50,7 @@ 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();
@@ -121,6 +121,7 @@ export default ({ comment, top, commentId, recalculateTops }) => {
     });
     // if (allCommentsWithSameId.length > 1);
     // maxPos += last(allCommentsWithSameId).node.nodeSize;
+    recalculateTops();
     dispatch(state.tr.removeMark(minPos, maxPos, commentMark));
     activeView.focus();
   };
diff --git a/wax-prosemirror-services/src/NoteService/Editor.js b/wax-prosemirror-services/src/NoteService/Editor.js
index d8b7871bd1586f88a251eda49d5e0d60979a31d6..a77c8da0c009c1cacd268916ef99e2dc9d5fb66a 100644
--- a/wax-prosemirror-services/src/NoteService/Editor.js
+++ b/wax-prosemirror-services/src/NoteService/Editor.js
@@ -2,7 +2,7 @@
 import React, { useEffect, useRef, useContext, useMemo } from 'react';
 import { filter } from 'lodash';
 import { EditorView } from 'prosemirror-view';
-import { EditorState } from 'prosemirror-state';
+import { EditorState, TextSelection } from 'prosemirror-state';
 import { StepMap } from 'prosemirror-transform';
 import { baseKeymap } from 'prosemirror-commands';
 import { keymap } from 'prosemirror-keymap';
@@ -37,6 +37,14 @@ export default ({ node, view }) => {
         // This is the magic part
         dispatchTransaction,
         handleDOMEvents: {
+          blur: () => {
+            context.view[noteId].dispatch(
+              context.view[noteId].state.tr.setSelection(
+                new TextSelection(context.view[noteId].state.tr.doc.resolve(0)),
+              ),
+            );
+          },
+
           mousedown: () => {
             context.updateView({}, noteId);
             clickInNote = true;