diff --git a/wax-prosemirror-core/src/ioc-react.js b/wax-prosemirror-core/src/ioc-react.js
index 953832af6222980893dbb6f2f3afea34f429953d..36f768cc2e6548ff5e59035f16d6091392d81cc2 100644
--- a/wax-prosemirror-core/src/ioc-react.js
+++ b/wax-prosemirror-core/src/ioc-react.js
@@ -19,7 +19,7 @@ export default props => {
       setContext({
         ...context,
         view: Object.assign(context.view, view),
-        activeView: view.activeView || view,
+        activeView: view.main || view,
         activeViewId: view.activeViewId
       });
     },
diff --git a/wax-prosemirror-layouts/src/layouts/EditoriaLayout.js b/wax-prosemirror-layouts/src/layouts/EditoriaLayout.js
index 884c630552e69d9fc6fc9ca69df99a24cfdb1c5b..466a4c0614c8d40c80bceb1192721f525fc140de 100644
--- a/wax-prosemirror-layouts/src/layouts/EditoriaLayout.js
+++ b/wax-prosemirror-layouts/src/layouts/EditoriaLayout.js
@@ -210,7 +210,7 @@ const WaxOverlays = componentPlugin("waxOverlays");
 const withNotes = () => {
   return (
     <NotesAreaContainer>
-      <NotesContainer>
+      <NotesContainer id="notes-container">
         <NotesArea />
       </NotesContainer>
       <CommentsContainer>