diff --git a/client/scss/components/_drilldown.scss b/client/scss/components/_drilldown.scss
index 493aa799d3..3442119492 100644
--- a/client/scss/components/_drilldown.scss
+++ b/client/scss/components/_drilldown.scss
@@ -60,10 +60,15 @@
   }
 }
 
+.w-drilldown__submenu .w-field__wrapper {
+  // Align the margin-top with the submenu’s back button
+  // and reduce the default margin-bottom.
+  margin-top: theme('spacing.2');
+  margin-bottom: theme('spacing.2');
+}
+
 .w-drilldown__submenu .w-field__label {
   @apply w-label-1;
-  // Align with the submenu’s back button.
-  margin-top: theme('spacing.2');
   margin-bottom: theme('spacing.3');
 }
 
diff --git a/client/scss/components/_header.scss b/client/scss/components/_header.scss
index ea91500f22..5d7763f257 100644
--- a/client/scss/components/_header.scss
+++ b/client/scss/components/_header.scss
@@ -174,7 +174,7 @@
     @apply w-mx-2 w-flex w-items-center w-gap-2;
   }
 
-  .w-field__wrapper:not(.w-dialog .w-field__wrapper) {
+  .w-field__wrapper:not(.w-drilldown .w-field__wrapper) {
     @apply w-mb-0;
 
     .w-field__input {