diff --git a/frappe/public/js/frappe/form/grid_row_form.js b/frappe/public/js/frappe/form/grid_row_form.js
index 399f233c54..68e4178ae7 100644
--- a/frappe/public/js/frappe/form/grid_row_form.js
+++ b/frappe/public/js/frappe/form/grid_row_form.js
@@ -66,7 +66,7 @@ export default class GridRowForm {
 				</div>
 			</div>
 			<div class="grid-form-body">
-				<div class="form-area"></div>
+				<div class="form-area scrollable"></div>
 				<div class="grid-footer-toolbar hidden-xs flex justify-between">
 					<div class="grid-shortcuts">
 						<span> ${frappe.utils.icon("keyboard", "md")} </span>
diff --git a/frappe/public/scss/desk/grid.scss b/frappe/public/scss/desk/grid.scss
index 5da037bd9a..047e3187b1 100644
--- a/frappe/public/scss/desk/grid.scss
+++ b/frappe/public/scss/desk/grid.scss
@@ -340,8 +340,8 @@
 }
 
 .grid-form-body {
-	.form-area {
-		max-height: 70vh;
+	.form-area.scrollable {
+		max-height: calc(100vh - 3.5rem);
 		overflow-y: auto;
 	}
 }