diff --git a/src/views/editView.js b/src/views/editView.js
index 4ca4557c1bf1de40306c7ce70c7ac00fb822eecb..1d099d28f85639d8ffd17842f7151b4d032af1d1 100644
--- a/src/views/editView.js
+++ b/src/views/editView.js
@@ -229,7 +229,9 @@ export default class EditView extends ItemView {
           events: { onclick: () => { this.beforeSubmit(); } },
         }),
       ]),
-      m('div.maincontainer', children),
+      m('div.maincontainer', {
+        style: { height: 'calc(100vh - 130px)', 'overflow-y': 'scroll' },
+      }, children),
     ]);
   }
 }
diff --git a/src/views/itemView.js b/src/views/itemView.js
index 8f762ff56db965a00c0d4075c46439e38d71ed57..60806ef0d7af1796e505bddc32d83050aef22dfc 100644
--- a/src/views/itemView.js
+++ b/src/views/itemView.js
@@ -51,7 +51,7 @@ export default class ItemView {
 
   layout(children) {
     if (!this.controller || !this.controller.data) return '';
-    return m('div', { style: { height: '100%', 'overflow-y': 'scroll' } }, [
+    return m('div', [
       m(Toolbar, m('div.pe-button-row', [
         m(Button, {
           element: 'div',
@@ -66,7 +66,9 @@ export default class ItemView {
           events: { onclick: () => this.delete() },
         }),
       ])),
-      children,
+      m('div', {
+        style: { height: 'calc(100vh - 130px)', 'overflow-y': 'scroll' },
+      }, children),
     ]);
   }
 }