diff --git a/ui/src/admin/components/DatabaseTable.js b/ui/src/admin/components/DatabaseTable.js
index 99c430c5b0..852c137eb7 100644
--- a/ui/src/admin/components/DatabaseTable.js
+++ b/ui/src/admin/components/DatabaseTable.js
@@ -57,7 +57,7 @@ const DatabaseTable = ({
                     onCancel={onCancelRetentionPolicy}
                     onConfirm={onCreateRetentionPolicy}
                     onStopEdit={onStopEditRetentionPolicy}
-                    handleClickOutside={() => onStopEditRetentionPolicy({database, retentionPolicy: rp})}
+                    handleClickOutside={() => rp.isNew ? onCancelRetentionPolicy({database, retentionPolicy: rp}) : onStopEditRetentionPolicy({database, retentionPolicy: rp})}
                   />
                 )
               })