diff --git a/frappe/public/js/frappe/form/grid_row.js b/frappe/public/js/frappe/form/grid_row.js
index a5735ad359..814aa7c4f3 100644
--- a/frappe/public/js/frappe/form/grid_row.js
+++ b/frappe/public/js/frappe/form/grid_row.js
@@ -1038,7 +1038,7 @@ export default class GridRow {
 		let is_focused = false;
 
 		var $col = $(
-			`<div class="col grid-static-col col-xs-${colsize} ${add_class}" style="${add_style}"></div>`
+			`<div class="col grid-static-col grid-data-column col-xs-${colsize} ${add_class}" style="${add_style}"></div>`
 		)
 			.attr("data-fieldname", df.fieldname)
 			.attr("data-fieldtype", df.fieldtype)
diff --git a/frappe/public/scss/common/grid.scss b/frappe/public/scss/common/grid.scss
index c9cca2dd86..70c60799ab 100644
--- a/frappe/public/scss/common/grid.scss
+++ b/frappe/public/scss/common/grid.scss
@@ -75,6 +75,10 @@
 	}
 	.grid-static-col {
 		padding: 6px 8px !important;
+		&.grid-data-column {
+			flex: 1;
+			max-width: none;
+		}
 		.static-area {
 			&.reqd:after {
 				content: " *";
@@ -245,6 +249,9 @@
 		display: flex;
 		justify-content: center;
 		align-items: center;
+		flex-grow: 0;
+		max-width: 30px;
+		flex-basis: auto;
 	}
 
 	.col {
@@ -388,6 +395,10 @@
 	}
 	.grid-static-col {
 		background-color: var(--fg-color);
+		&.grid-data-column {
+			flex: 1;
+			max-width: none;
+		}
 		&.sticky-grid-col {
 			position: sticky;
 			z-index: 1;