diff --git a/editors/editoria/src/layout/EditoriaLayout.js b/editors/editoria/src/layout/EditoriaLayout.js
index ce371bacb7bb7b415777740e66acb0f81e7cca74..417566f11d6b4f5687f272df7fbdedaf983d0027 100644
--- a/editors/editoria/src/layout/EditoriaLayout.js
+++ b/editors/editoria/src/layout/EditoriaLayout.js
@@ -119,6 +119,9 @@ const NotesAreaContainer = styled.div`
   position: absolute;
   /* PM styles  for note content*/
   ${EditorElements};
+  .ProseMirror {
+    display: inline;
+  }
 `;
 
 const NotesContainer = styled.div`
diff --git a/wax-prosemirror-components/src/components/comments/CommentBubbleComponent.js b/wax-prosemirror-components/src/components/comments/CommentBubbleComponent.js
index 8443731c4d9d9fc5194d8231a452df6b482d491d..9e9f9818b5293a9c99db74ff407d8481a6eff31b 100644
--- a/wax-prosemirror-components/src/components/comments/CommentBubbleComponent.js
+++ b/wax-prosemirror-components/src/components/comments/CommentBubbleComponent.js
@@ -30,17 +30,31 @@ const CommentBubbleComponent = ({
     activeView.focus();
   };
 
-  const isSelectionComment = () => {
+  const isCommentAllowed = () => {
     const commentMark = activeView.state.schema.marks.comment;
     const mark = DocumentHelpers.findMark(state, commentMark, true);
 
+    let allowed = true;
+    state.doc.nodesBetween(
+      state.selection.$from.pos,
+      state.selection.$to.pos,
+      (node, from) => {
+        if (
+          node.type.name === 'math_display' ||
+          node.type.name === 'math_inline'
+        ) {
+          allowed = false;
+        }
+      },
+    );
+
     // TODO Overlapping comments . for now don't allow
-    if (mark.length >= 1) return true;
-    return false;
+    if (mark.length >= 1) allowed = false;
+    return allowed;
   };
 
   return (
-    !isSelectionComment() &&
+    isCommentAllowed() &&
     showComment(activeViewId) && (
       <CommentBubble
         onClick={event => {
diff --git a/wax-prosemirror-components/src/components/notes/NoteEditorContainer.js b/wax-prosemirror-components/src/components/notes/NoteEditorContainer.js
index 81ea93833d8098ab51b0f2afc9ce5573081a29a5..8e08ea86c095800921f7b00b8ebd39c914935fc6 100644
--- a/wax-prosemirror-components/src/components/notes/NoteEditorContainer.js
+++ b/wax-prosemirror-components/src/components/notes/NoteEditorContainer.js
@@ -25,15 +25,6 @@ const NoteStyled = styled.div`
   height: 100%;
   border-bottom: 1px solid black;
 
-  span.comment {
-    border-bottom: none !important;
-    &: after {
-      content: '';
-      border-bottom: 2px solid gold;
-      display: block;
-    }
-  }
-
   &:focus {
     outline: none;
   }
diff --git a/wax-prosemirror-services/src/ShortCutsService/ShortCuts.js b/wax-prosemirror-services/src/ShortCutsService/ShortCuts.js
index 2370331b4a262d70b71879fabcfc58ed803dcdfa..3d5ceac0c6495a988d231ec74fd5b26d1d2bc8b2 100644
--- a/wax-prosemirror-services/src/ShortCutsService/ShortCuts.js
+++ b/wax-prosemirror-services/src/ShortCutsService/ShortCuts.js
@@ -1,5 +1,4 @@
 import { injectable } from 'inversify';
-import { minBy, maxBy } from 'lodash';
 import { keymap } from 'prosemirror-keymap';
 import { undo, redo } from 'prosemirror-history';
 
@@ -9,6 +8,7 @@ import {
   liftListItem,
   sinkListItem,
 } from 'prosemirror-schema-list';
+import { NodeSelection, TextSelection } from 'prosemirror-state';
 
 import {
   baseKeymap,
@@ -26,12 +26,37 @@ const backSpace = chainCommands(
   selectNodeBackward,
 );
 
-const backSpaceShortCut = (state, dispatch, view) =>
+const backSpaceShortCut = (state, dispatch, view) => {
+  const { $from, $to } = state.selection;
+  const { nodeBefore } = $from;
+  if (!nodeBefore) {
+    return false;
+  }
+
+  if (nodeBefore.type.name === 'math_inline') {
+    const index = $from.index($from.depth);
+    const $beforePos = state.doc.resolve($from.posAtIndex(index - 1));
+
+    dispatch(state.tr.setSelection(new NodeSelection($beforePos)));
+
+    return true;
+  }
+
+  state.doc.nodesBetween($from.pos, $to.pos, (node, from) => {
+    if (node.type.name === 'math_display') {
+      const $start = state.tr.doc.resolve(state.tr.selection.$anchor.start());
+      const $end = state.tr.doc.resolve(state.tr.selection.$anchor.end());
+
+      dispatch(state.tr.setSelection(new TextSelection($start, $end)));
+    }
+  });
+
   backSpace(
     state,
     tr => dispatch(tr.setMeta('inputType', 'backwardsDelete')),
     view,
   );
+};
 
 const undoShortCut = (state, dispatch, view) =>
   undo(state, tr => dispatch(tr.setMeta('inputType', 'Undo')), view);