diff --git a/app/components/SimpleEditor/Editor.js b/app/components/SimpleEditor/Editor.js
index 14dfe71c9b3ca3f8296e3aa1ed800c50477ad4b7..535543934e8959ef3c787be772f9c9ca4fea3215 100644
--- a/app/components/SimpleEditor/Editor.js
+++ b/app/components/SimpleEditor/Editor.js
@@ -10,7 +10,7 @@ import Comments from './panes/Comments/CommentBoxList'
 import CommentsProvider from './panes/Comments/CommentsProvider'
 import ContainerEditor from './ContainerEditor'
 
-import Notes from './panes/Notes/Notes'
+// import Notes from './panes/Notes/Notes'
 import NotesProvider from './panes/Notes/NotesProvider'
 
 // import TableOfContents from './panes/TableOfContents/TableOfContents'
diff --git a/app/components/SimpleEditor/SimpleEditor.scss b/app/components/SimpleEditor/SimpleEditor.scss
index a2feca5d263a21a39cb0c1c7780c72deea413f83..319734459ed7108d38e840faf11de5e90b851700 100644
--- a/app/components/SimpleEditor/SimpleEditor.scss
+++ b/app/components/SimpleEditor/SimpleEditor.scss
@@ -263,7 +263,7 @@ $active-blue: #4a90e2;
     color: $transparent-black;
     font-family: 'Fira Sans';
     line-height: 38px;
-    margin: 1.5% 0% 5% 15%;
+    margin: 1.5% 0% 0% 15%;
     min-height: 100vh;
     padding: 1% 0%;
     transition: .3s;
diff --git a/app/components/SimpleEditor/notesEditor/notesEditor.scss b/app/components/SimpleEditor/notesEditor/notesEditor.scss
index 35501b026ecd9bac7dc1aadc8712a3c2bfa8381c..08b758457736f254f39066006f2ad3d0943b38ca 100644
--- a/app/components/SimpleEditor/notesEditor/notesEditor.scss
+++ b/app/components/SimpleEditor/notesEditor/notesEditor.scss
@@ -16,10 +16,10 @@ $background: #fff;
 
     .se-scrollable {
       background: $background;
-      margin-top: 0;
-      min-height: 95px;
+      margin: 0% 0% 5% 0%;
+      min-height: 135px;
 
-     .se-content {
+     div.se-content {
        background: $background;
        box-shadow: none;
        margin: 0;
diff --git a/app/components/SimpleEditor/panes/Notes/Notes.js b/app/components/SimpleEditor/panes/Notes/Notes.js
index 3124b9b3eae31203a99bb167137d04008e212be9..266b732f27da6837e4d46192399cef969ada6c43 100644
--- a/app/components/SimpleEditor/panes/Notes/Notes.js
+++ b/app/components/SimpleEditor/panes/Notes/Notes.js
@@ -19,11 +19,7 @@ class Notes extends Component {
   }
 
   didUpdate () {
-    // TEMP This will be merged in redesign branch.
-    this.el.el.classList.remove('sm-auto-fill')
-    this.el.el.classList.remove('se-pane')
-    const mainScrollPane = document.getElementById('content-panel')
-    mainScrollPane.style.height = this.el.el.offsetTop - 162 + 'px'
+    this.computeScrollPane()
   }
 
   render ($$) {
@@ -104,6 +100,11 @@ class Notes extends Component {
     window.removeEventListener('mouseup', this.stopResize, false)
   }
 
+  computeScrollPane () {
+    const mainScrollPane = document.getElementById('content-panel').children
+    mainScrollPane[0].style.maxHeight = this.el.el.offsetTop - 162 + 'px'
+  }
+
   onNotesUpdated (change) {
     const notesProvider = this.getProvider()
     notesProvider.handleDocumentChange(change)
diff --git a/app/components/SimpleEditor/panes/Notes/notes.scss b/app/components/SimpleEditor/panes/Notes/notes.scss
index e682349f0c4574d09e0d32e4e2bc69b87fd18446..2d72962ef684faf4e47ddd4a179549ccc711c959 100644
--- a/app/components/SimpleEditor/panes/Notes/notes.scss
+++ b/app/components/SimpleEditor/panes/Notes/notes.scss
@@ -5,7 +5,7 @@ $light-blue: #e4f0ff;
   background-color: $white;
   bottom: 0;
   counter-reset: note-footer;
-  height: 95px;
+  height: 135px;
   left: 15%;
   max-height: 700px;
   min-height: 10px;