diff --git a/frontend/src/metabase/core/components/FormField/FormField.styled.tsx b/frontend/src/metabase/core/components/FormField/FormField.styled.tsx
index bb714221b04be6641e5cdcc9f49a0ffa400423e4..3957153fba24ac0c2ecd67b5bc2028f4e778f117 100644
--- a/frontend/src/metabase/core/components/FormField/FormField.styled.tsx
+++ b/frontend/src/metabase/core/components/FormField/FormField.styled.tsx
@@ -72,13 +72,16 @@ export const FieldInfoLabel = styled.div`
 `;
 
 export interface FieldRootProps {
+  alignment: FieldAlignment;
   orientation: FieldOrientation;
 }
 
 export const FieldRoot = styled.div<FieldRootProps>`
   display: ${props => props.orientation === "horizontal" && "flex"};
   justify-content: ${props =>
-    props.orientation === "horizontal" && "space-between"};
+    props.alignment === "end" &&
+    props.orientation === "horizontal" &&
+    "space-between"};
   margin-bottom: 1.25rem;
 
   &:focus-within {
diff --git a/frontend/src/metabase/core/components/FormField/FormField.tsx b/frontend/src/metabase/core/components/FormField/FormField.tsx
index cd1cd2dc48e21368c9b9f85592ba0e61f64d6a72..7cf5c83f90b0d71df0d3bd71575d62f085159137 100644
--- a/frontend/src/metabase/core/components/FormField/FormField.tsx
+++ b/frontend/src/metabase/core/components/FormField/FormField.tsx
@@ -45,7 +45,12 @@ const FormField = forwardRef(function FormField(
   const hasError = Boolean(error);
 
   return (
-    <FieldRoot {...props} ref={ref} orientation={orientation}>
+    <FieldRoot
+      {...props}
+      ref={ref}
+      alignment={alignment}
+      orientation={orientation}
+    >
       {alignment === "start" && children}
       {(title || description) && (
         <FieldCaption alignment={alignment} orientation={orientation}>