diff --git a/invokeai/frontend/web/src/features/nodes/components/flow/panels/TopRightPanel/WorkflowEditorSettings.tsx b/invokeai/frontend/web/src/features/nodes/components/flow/panels/TopRightPanel/WorkflowEditorSettings.tsx
index 152594f42a..cfb6c99043 100644
--- a/invokeai/frontend/web/src/features/nodes/components/flow/panels/TopRightPanel/WorkflowEditorSettings.tsx
+++ b/invokeai/frontend/web/src/features/nodes/components/flow/panels/TopRightPanel/WorkflowEditorSettings.tsx
@@ -1,7 +1,9 @@
+import type { FormLabelProps } from '@invoke-ai/ui-library';
 import {
   Divider,
   Flex,
   FormControl,
+  FormControlGroup,
   FormHelperText,
   FormLabel,
   Heading,
@@ -30,6 +32,8 @@ import { memo, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 import { SelectionMode } from 'reactflow';
 
+const formLabelProps: FormLabelProps = { flexGrow: 1 };
+
 const selector = createMemoizedSelector(selectNodesSlice, (nodes) => {
   const { shouldAnimateEdges, shouldValidateGraph, shouldSnapToGrid, shouldColorEdges, selectionMode } = nodes;
   return {
@@ -100,37 +104,51 @@ const WorkflowEditorSettings = ({ children }: Props) => {
           <ModalBody>
             <Flex flexDirection="column" gap={4} py={4}>
               <Heading size="sm">{t('parameters.general')}</Heading>
-              <FormControl>
-                <FormLabel>{t('nodes.animatedEdges')}</FormLabel>
-                <Switch onChange={handleChangeShouldAnimate} isChecked={shouldAnimateEdges} />
-                <FormHelperText>{t('nodes.animatedEdgesHelp')}</FormHelperText>
-              </FormControl>
-              <Divider />
-              <FormControl>
-                <FormLabel>{t('nodes.snapToGrid')}</FormLabel>
-                <Switch isChecked={shouldSnapToGrid} onChange={handleChangeShouldSnap} />
-                <FormHelperText>{t('nodes.snapToGridHelp')}</FormHelperText>
-              </FormControl>
-              <Divider />
-              <FormControl>
-                <FormLabel>{t('nodes.colorCodeEdges')}</FormLabel>
-                <Switch isChecked={shouldColorEdges} onChange={handleChangeShouldColor} />
-                <FormHelperText>{t('nodes.colorCodeEdgesHelp')}</FormHelperText>
-              </FormControl>
-              <Divider />
-              <FormControl>
-                <FormLabel>{t('nodes.fullyContainNodes')}</FormLabel>
-                <Switch isChecked={selectionModeIsChecked} onChange={handleChangeSelectionMode} />
-                <FormHelperText>{t('nodes.fullyContainNodesHelp')}</FormHelperText>
-              </FormControl>
-              <Heading size="sm" pt={4}>
-                {t('common.advanced')}
-              </Heading>
-              <FormControl>
-                <FormLabel>{t('nodes.validateConnections')}</FormLabel>
-                <Switch isChecked={shouldValidateGraph} onChange={handleChangeShouldValidate} />
-                <FormHelperText>{t('nodes.validateConnectionsHelp')}</FormHelperText>
-              </FormControl>
+              <FormControlGroup orientation="vertical" formLabelProps={formLabelProps}>
+                <FormControl>
+                  <Flex w="full">
+                    <FormLabel>{t('nodes.animatedEdges')}</FormLabel>
+                    <Switch onChange={handleChangeShouldAnimate} isChecked={shouldAnimateEdges} />
+                  </Flex>
+                  <FormHelperText>{t('nodes.animatedEdgesHelp')}</FormHelperText>
+                </FormControl>
+                <Divider />
+                <FormControl>
+                  <Flex w="full">
+                    <FormLabel>{t('nodes.snapToGrid')}</FormLabel>
+                    <Switch isChecked={shouldSnapToGrid} onChange={handleChangeShouldSnap} />
+                  </Flex>
+                  <FormHelperText>{t('nodes.snapToGridHelp')}</FormHelperText>
+                </FormControl>
+                <Divider />
+                <FormControl>
+                  <Flex w="full">
+                    <FormLabel>{t('nodes.colorCodeEdges')}</FormLabel>
+                    <Switch isChecked={shouldColorEdges} onChange={handleChangeShouldColor} />
+                  </Flex>
+                  <FormHelperText>{t('nodes.colorCodeEdgesHelp')}</FormHelperText>
+                </FormControl>
+                <Divider />
+                <FormControl>
+                  <Flex w="full">
+                    <FormLabel>{t('nodes.fullyContainNodes')}</FormLabel>
+                    <Switch isChecked={selectionModeIsChecked} onChange={handleChangeSelectionMode} />
+                  </Flex>
+                  <FormHelperText>{t('nodes.fullyContainNodesHelp')}</FormHelperText>
+                </FormControl>
+                <Divider />
+                <Heading size="sm" pt={4}>
+                  {t('common.advanced')}
+                </Heading>
+                <FormControl>
+                  <Flex w="full">
+                    <FormLabel>{t('nodes.validateConnections')}</FormLabel>
+                    <Switch isChecked={shouldValidateGraph} onChange={handleChangeShouldValidate} />
+                  </Flex>
+                  <FormHelperText>{t('nodes.validateConnectionsHelp')}</FormHelperText>
+                </FormControl>
+                <Divider />
+              </FormControlGroup>
               <ReloadNodeTemplatesButton />
             </Flex>
           </ModalBody>