diff --git a/frappe/public/scss/dark.scss b/frappe/public/scss/dark.scss
index 45b816e915..4be2c1b1e8 100644
--- a/frappe/public/scss/dark.scss
+++ b/frappe/public/scss/dark.scss
@@ -43,7 +43,7 @@
 		}
 	}
 
-	.modal {
+	.modal, .form-in-grid {
 		--control-bg: var(--gray-800);
 		--border-color: var(--gray-600);
 	}
diff --git a/frappe/public/scss/grid.scss b/frappe/public/scss/grid.scss
index b84b4ec5fa..fe9aff35f3 100644
--- a/frappe/public/scss/grid.scss
+++ b/frappe/public/scss/grid.scss
@@ -33,7 +33,7 @@
 }
 
 .grid-body {
-	background-color: #fff;
+	background-color: var(--fg-color);
 }
 
 .form-grid .data-row {
@@ -239,7 +239,7 @@
 }
 
 @mixin base-grid(){
-	background-color: white;
+	background-color: var(--modal-bg);
 	position: relative;
 	transition: opacity .2s ease;
 }
@@ -324,7 +324,7 @@
 
 .grid-footer {
 	padding: 10px 0px;
-	background-color: #fff;
+	background-color: var(--fg-color);
 
 	.btn {
 		box-shadow: none;