diff --git a/editors/editoria/src/Editoria.js b/editors/editoria/src/Editoria.js
index 91cca482a9ade21075b3b7b3f19fa13a64e0fce4..69a480fa4c0e4b5d9bc36c6f5b815f5b9ccd615c 100644
--- a/editors/editoria/src/Editoria.js
+++ b/editors/editoria/src/Editoria.js
@@ -17,6 +17,11 @@ const GlobalStyle = createGlobalStyle`
   body {
     margin: 0;
     padding: 0;
+    overflow-y: hidden;
+  #root {
+    height:100vh;
+    width:100vw;
+  }
   }
 `;
 const StyledWax = styled(Wax)`
@@ -36,10 +41,11 @@ class Editoria extends Component {
           placeholder="Type Something..."
           theme="editoria"
           layout="editoria"
+          debug
           renderLayout={({ editor, ...props }) => (
             <React.Fragment>
               <MainMenuBar {...props} />
-              <div className="wax-surface-scroll">{editor}</div>
+              <div className="wax-surface-container">{editor}</div>
             </React.Fragment>
           )}
         />
diff --git a/wax-prosemirror-core/src/Editor.js b/wax-prosemirror-core/src/Editor.js
index 89d0c28d8e2eefe68df581a9bc5d99ca15fee5ce..2a18bda56449538255b873e46b05b2fb02e4930f 100644
--- a/wax-prosemirror-core/src/Editor.js
+++ b/wax-prosemirror-core/src/Editor.js
@@ -99,8 +99,8 @@ class Editor extends Component {
   render() {
     const { theme } = this.props;
     const WaxTheme = theme
-      ? `wax-surface-container wax-t-${theme}`
-      : "wax-surface-container";
+      ? `wax-surface-scroll wax-t-${theme}`
+      : "wax-surface-scroll";
 
     const editor = <div ref={this.createEditorView} className={WaxTheme} />;
     return this.props.renderLayout({
diff --git a/wax-prosemirror-layouts/layouts/editoria-layout.css b/wax-prosemirror-layouts/layouts/editoria-layout.css
index 5cce9de5338e4f1bba36d145201a4d111797c451..4fbb9d9934912a68ddf4259c777bbc9a1132ea7b 100644
--- a/wax-prosemirror-layouts/layouts/editoria-layout.css
+++ b/wax-prosemirror-layouts/layouts/editoria-layout.css
@@ -46,6 +46,6 @@
   right: 0;
   top: 0;
   box-sizing: border-box;
-  padding-top: 45px;
+  padding: 0;
   margin-left: 20px;
 }