diff --git a/frontend/src/global_styles/primer/_overrides.sass b/frontend/src/global_styles/primer/_overrides.sass
index 570bc7c90340..396c4ded90bd 100644
--- a/frontend/src/global_styles/primer/_overrides.sass
+++ b/frontend/src/global_styles/primer/_overrides.sass
@@ -91,3 +91,7 @@ sub-header,
   &:hover
     background: var(--header-item-bg-hover-color)
     color: var(--header-item-font-hover-color)
+  
+// Todo: Remove once https://github.com/primer/view_components/pull/3087 is merged
+.FormControl-spacingWrapper
+  row-gap: var(--stack-gap-normal)