diff --git a/src/static/main.css b/src/static/main.css
index 691579357..7355bf746 100644
--- a/src/static/main.css
+++ b/src/static/main.css
@@ -63,11 +63,12 @@ hr {
 /* App frame */
 
 #octo-tasks-app {
-	min-height: 100%;
+	height: 100%;
+	overflow: hidden;
 }
 
 #octo-tasks-app > #main {
-	min-height: 100%;
+	height: 100%;
 }
 
 /* Sidebar */
@@ -76,7 +77,7 @@ hr {
 	display: flex;
 	flex-direction: row;
 
-	min-height: 100%;
+	height: 100%;
 }
 
 .octo-sidebar {
@@ -108,9 +109,19 @@ hr {
 
 /* Main app */
 
-.octo-frame {
-	padding: 10px 95px 50px 95px;
+.octo-app {
+	display: flex;
+	flex-direction: column;
+
 	min-width: 1000px;
+	overflow: auto;
+}
+
+.octo-frame {
+	display: flex;
+	flex-direction: column;
+
+	padding: 10px 95px 50px 95px;
 }
 
 .octo-board {