diff --git a/components/settings/unified/UnifiedSettingsModal.tsx b/components/settings/unified/UnifiedSettingsModal.tsx
index ec4f9cc..8b57088 100644
--- a/components/settings/unified/UnifiedSettingsModal.tsx
+++ b/components/settings/unified/UnifiedSettingsModal.tsx
@@ -279,7 +279,9 @@ export default function UnifiedSettingsModal() {
 
   const handleDiscard = useCallback(() => {
     isDirtyRef.current = false
+    setIsDirtyVisible(false)
     setHasPendingAction(false)
+    saveHandlerRef.current = null
     const action = pendingActionRef.current
     pendingActionRef.current = null
     action?.()