diff --git a/app/javascript/styles/gabsocial/components.scss b/app/javascript/styles/gabsocial/components.scss
index 163efeb4..cd208103 100644
--- a/app/javascript/styles/gabsocial/components.scss
+++ b/app/javascript/styles/gabsocial/components.scss
@@ -4876,13 +4876,21 @@ noscript {
 	&__content {
 		display: flex;
 		flex-direction: row;
+		flex: 1;
 		padding: 10px;
+		overflow-y: hidden;
 
 		.timeline-compose-block {
 			background: transparent !important;
 			width: 100%;
 			padding: 10px 5px;
 			margin-bottom: 0;
+
+			.compose-form {
+				max-height: 100%;
+				display: flex;
+				flex-direction: column;
+			}
 		}
 	}
 
diff --git a/app/javascript/styles/gabsocial/components/modal.scss b/app/javascript/styles/gabsocial/components/modal.scss
index 1b8346cd..3cfb7854 100644
--- a/app/javascript/styles/gabsocial/components/modal.scss
+++ b/app/javascript/styles/gabsocial/components/modal.scss
@@ -34,6 +34,8 @@
 	pointer-events: auto;
 	display: flex;
 	z-index: 9999;
+	max-height: 100%;
+	overflow-y: hidden;
 }
 
 .video-modal {