diff --git a/editors/demo/src/Editoria/layout/EditoriaLayout.js b/editors/demo/src/Editoria/layout/EditoriaLayout.js
index 6eec59820967f0128bf96c69ce0a2ede0cffa171..3a40000d648c92e861529ce56da83459e152a775 100644
--- a/editors/demo/src/Editoria/layout/EditoriaLayout.js
+++ b/editors/demo/src/Editoria/layout/EditoriaLayout.js
@@ -282,7 +282,6 @@ const EditoriaLayout = ({ editor }) => {
                   </CommentTrackToolsContainer>
                   <RightArea area="main" />
                 </CommentsContainer>
-                <WaxOverlays />
               </WaxSurfaceScroll>
 
               {hasNotes && (
@@ -298,7 +297,7 @@ const EditoriaLayout = ({ editor }) => {
             </PanelGroup>
           </EditorArea>
         </Main>
-
+        <WaxOverlays />
         <WaxBottomRightInfo>
           <InfoContainer id="info-container">
             <BottomRightInfo />
diff --git a/wax-prosemirror-services/src/OverlayService/usePosition.js b/wax-prosemirror-services/src/OverlayService/usePosition.js
index fe20d24b41011af59ab8783c7bbeba92f46de478..d5e63043f6901b59253228b90a30b28c49f96376 100644
--- a/wax-prosemirror-services/src/OverlayService/usePosition.js
+++ b/wax-prosemirror-services/src/OverlayService/usePosition.js
@@ -33,15 +33,8 @@ export default options => {
     const WaxSurface = focusedView.dom.getBoundingClientRect();
     const start = focusedView.coordsAtPos(from);
     const end = focusedView.coordsAtPos(to);
-    // const { left } = end;
-    // const top = end.top + 20;
-
-    // TEMP FIX
-
-    const parent = focusedView.dom.parentNode.getBoundingClientRect();
-
     const { left } = end;
-    const top = parent.top + 20;
+    const top = end.top + 20;
     return {
       top,
       left,