diff --git a/src/components/ReactFileUtilities/UploadButton.tsx b/src/components/ReactFileUtilities/UploadButton.tsx
index 653f7b350..a4e4f78b0 100644
--- a/src/components/ReactFileUtilities/UploadButton.tsx
+++ b/src/components/ReactFileUtilities/UploadButton.tsx
@@ -50,7 +50,7 @@ export const UploadFileInput = forwardRef(function UploadFileInput(
   ref: React.ForwardedRef<HTMLInputElement>,
 ) {
   const { t } = useTranslationContext('UploadFileInput');
-  const { cooldownRemaining } = useMessageInputContext();
+  const { cooldownRemaining, textareaRef } = useMessageInputContext();
   const messageComposer = useMessageComposer();
   const { attachmentManager } = messageComposer;
   const { isUploadEnabled } = useAttachmentManagerState();
@@ -63,9 +63,10 @@ export const UploadFileInput = forwardRef(function UploadFileInput(
   const onFileChange = useCallback(
     (files: Array<File>) => {
       attachmentManager.uploadFiles(files);
+      textareaRef.current?.focus();
       onFileChangeCustom?.(files);
     },
-    [onFileChangeCustom, attachmentManager],
+    [onFileChangeCustom, attachmentManager, textareaRef],
   );
 
   return (