diff --git a/src/frontend/src/modals/baseModal/index.tsx b/src/frontend/src/modals/baseModal/index.tsx
index 7fab2f2f9..1ce1a20f3 100644
--- a/src/frontend/src/modals/baseModal/index.tsx
+++ b/src/frontend/src/modals/baseModal/index.tsx
@@ -105,6 +105,7 @@ const Footer: React.FC<{
               type={submit.onClick ? "button" : "submit"}
               onClick={submit.onClick}
               loading={submit.loading}
+              disabled={submit.disabled}
             >
               {submit.icon && submit.icon}
               {submit.label}
diff --git a/src/frontend/src/modals/flowSettingsModal/index.tsx b/src/frontend/src/modals/flowSettingsModal/index.tsx
index d810733f4..e5bc58d0d 100644
--- a/src/frontend/src/modals/flowSettingsModal/index.tsx
+++ b/src/frontend/src/modals/flowSettingsModal/index.tsx
@@ -80,7 +80,7 @@ export default function FlowSettingsModal({
       <BaseModal.Footer
         submit={{
           label: "Save",
-          disabled: nameLists.includes(name) && name !== currentFlow!.name,
+          disabled: nameLists.includes(name) || name === currentFlow!.name,
           dataTestId: "save-flow-settings",
           loading: isSaving,
         }}