diff --git a/frappe/public/scss/common/grid.scss b/frappe/public/scss/common/grid.scss
index 3ab72f8d29..36397faccf 100644
--- a/frappe/public/scss/common/grid.scss
+++ b/frappe/public/scss/common/grid.scss
@@ -507,7 +507,7 @@
 
 .grid-row-open .form-in-grid {
 	opacity: 1;
-	height: 100%;
+	height: auto;
 	overflow: auto;
 	margin: auto;
 	padding: var(--padding-sm) var(--padding-md);
@@ -517,6 +517,10 @@
 	left: 50%;
 	transform: translate(-50%, 0%);
 	width: 100%;
+	.grid-form-body {
+		max-height: 80vh;
+		overflow: scroll;
+	}
 }
 
 .grid-form-heading {