diff --git a/editors/demo/src/NCBI/layout/NcbiLayout.js b/editors/demo/src/NCBI/layout/NcbiLayout.js
index 061ccd11f29cedaf21bcc56ff1f1095bedbdf815..12f21dc14b632a28eef63a3815c207b9c392eb07 100644
--- a/editors/demo/src/NCBI/layout/NcbiLayout.js
+++ b/editors/demo/src/NCBI/layout/NcbiLayout.js
@@ -66,7 +66,7 @@ const EditorContainer = styled.div`
 `;
 
 const TopBar = ComponentPlugin('topBar');
-const WaxOverlays = ComponentPlugin('waxOverlays');
+
 const NcbiLayout = ({ editor }) => (
   <ThemeProvider theme={cokoTheme}>
     <Wrapper>
@@ -80,7 +80,6 @@ const NcbiLayout = ({ editor }) => (
           </WaxSurfaceScroll>
         </EditorArea>
       </Main>
-      <WaxOverlays />
     </Wrapper>
   </ThemeProvider>
 );
diff --git a/editors/demo/src/NCBI/layout/NcbiMiniLayout.js b/editors/demo/src/NCBI/layout/NcbiMiniLayout.js
index f1c6508b9f0bdcbb62162aedc10421c43ba82302..4216e4d30badaae47c80480c2042160db0b43bb8 100644
--- a/editors/demo/src/NCBI/layout/NcbiMiniLayout.js
+++ b/editors/demo/src/NCBI/layout/NcbiMiniLayout.js
@@ -68,7 +68,6 @@ const EditorContainer = styled.div`
 `;
 
 const TopBar = ComponentPlugin('topBar');
-const WaxOverlays = ComponentPlugin('waxOverlays');
 
 const NcbiLayout = ({ editor }) => (
   <ThemeProvider theme={cokoTheme}>
@@ -83,7 +82,6 @@ const NcbiLayout = ({ editor }) => (
           </WaxSurfaceScroll>
         </EditorArea>
       </Main>
-      <WaxOverlays />
     </Wrapper>
   </ThemeProvider>
 );
diff --git a/wax-prosemirror-core/src/WaxView.js b/wax-prosemirror-core/src/WaxView.js
index f3f1e7819ead30b6412a5fbd46c9e117172910a8..d355f3d60858ef736b5149d54bd35c06f63eacb3 100644
--- a/wax-prosemirror-core/src/WaxView.js
+++ b/wax-prosemirror-core/src/WaxView.js
@@ -151,7 +151,7 @@ const WaxView = forwardRef((props, ref) => {
   const editor = (
     <>
       <div ref={setEditorRef} />
-      {context.activeViewId === 'main' && <WaxOverlays />}
+      {context.activeViewId === 'main' && <WaxOverlays group="main" />}
       <WaxPortals />
     </>
   );
diff --git a/wax-prosemirror-services/src/NoteService/Editor.js b/wax-prosemirror-services/src/NoteService/Editor.js
index cbc9bf7dcef16d1fd18fe20c1bf4f3106401e742..319263c479bca3945f590afb3b9bd998faba4b6b 100644
--- a/wax-prosemirror-services/src/NoteService/Editor.js
+++ b/wax-prosemirror-services/src/NoteService/Editor.js
@@ -197,7 +197,7 @@ export default ({ node, view }) => {
   return (
     <NoteContainer>
       {NoteEditorContainerComponent}
-      {context.activeViewId === noteId && <WaxOverlays />}
+      {context.activeViewId === noteId && <WaxOverlays group="notes" />}
     </NoteContainer>
   );
 };