diff --git a/app/assets/javascripts/components/AttachedFilesPopover/PopoverFileItem.tsx b/app/assets/javascripts/components/AttachedFilesPopover/PopoverFileItem.tsx
index dee6cb335..17e051614 100644
--- a/app/assets/javascripts/components/AttachedFilesPopover/PopoverFileItem.tsx
+++ b/app/assets/javascripts/components/AttachedFilesPopover/PopoverFileItem.tsx
@@ -72,16 +72,14 @@ export const PopoverFileItem: FunctionComponent<PopoverFileItemProps> = ({
   }, [isRenamingFile]);
 
   const renameFile = async (file: SNFile, name: string) => {
-    const didRename = await handleFileAction({
+    await handleFileAction({
       type: PopoverFileItemActionType.RenameFile,
       payload: {
         file,
         name,
       },
     });
-    if (didRename) {
-      setIsRenamingFile(false);
-    }
+    setIsRenamingFile(false);
   };
 
   const handleFileNameInput = (event: Event) => {
@@ -90,11 +88,14 @@ export const PopoverFileItem: FunctionComponent<PopoverFileItemProps> = ({
 
   const handleFileNameInputKeyDown = (event: KeyboardEvent) => {
     if (event.key === KeyboardKey.Enter) {
-      renameFile(file, fileName);
-      return;
+      fileNameInputRef.current?.blur();
     }
   };
 
+  const handleFileNameInputBlur = () => {
+    renameFile(file, fileName);
+  };
+
   return (
     <div className="flex items-center justify-between p-3">
       <div className="flex items-center">
@@ -108,6 +109,7 @@ export const PopoverFileItem: FunctionComponent<PopoverFileItemProps> = ({
               ref={fileNameInputRef}
               onInput={handleFileNameInput}
               onKeyDown={handleFileNameInputKeyDown}
+              onBlur={handleFileNameInputBlur}
             />
           ) : (
             <div className="text-sm mb-1">{file.nameWithExt}</div>