diff --git a/dev/Styles/User/Compose.less b/dev/Styles/User/Compose.less
index 8e26aef0e..56eae3dd1 100644
--- a/dev/Styles/User/Compose.less
+++ b/dev/Styles/User/Compose.less
@@ -22,12 +22,18 @@
 
 	.tabs {
 		height: 100%;
+		max-height: 100%;
+		overflow: auto;
 	}
 
 	.tabs > label > * + * {
 		margin-left: 0.5em;
 	}
 
+	.tabs .tab-content {
+		overflow: auto;
+	}
+
 	.textAreaParent, .attachmentAreaParent {
 		height: 100%;
 		min-height: 200px;