diff --git a/console/src/components/upload/UppyUpload.vue b/console/src/components/upload/UppyUpload.vue
index 7d1c25211..3281cb3ca 100644
--- a/console/src/components/upload/UppyUpload.vue
+++ b/console/src/components/upload/UppyUpload.vue
@@ -24,6 +24,7 @@ const props = withDefaults(
     note?: string;
     method?: "GET" | "POST" | "PUT" | "HEAD" | "get" | "post" | "put" | "head";
     disabled?: boolean;
+    doneButtonHandler?: () => void;
   }>(),
   {
     restrictions: undefined,
@@ -34,6 +35,7 @@ const props = withDefaults(
     note: undefined,
     method: "post",
     disabled: false,
+    doneButtonHandler: undefined,
   }
 );
 
@@ -96,6 +98,11 @@ onUnmounted(() => {
 <template>
   <dashboard
     :uppy="uppy"
-    :props="{ theme: 'light', disabled: disabled, note: note }"
+    :props="{
+      theme: 'light',
+      disabled: disabled,
+      note: note,
+      doneButtonHandler: doneButtonHandler,
+    }"
   />
 </template>
diff --git a/console/src/modules/contents/attachments/components/AttachmentUploadModal.vue b/console/src/modules/contents/attachments/components/AttachmentUploadModal.vue
index e17c03351..f62877713 100644
--- a/console/src/modules/contents/attachments/components/AttachmentUploadModal.vue
+++ b/console/src/modules/contents/attachments/components/AttachmentUploadModal.vue
@@ -226,6 +226,7 @@ watch(
             ? ''
             : $t('core.attachment.upload_modal.filters.policy.not_select')
         "
+        :done-button-handler="() => onVisibleChange(false)"
       />
     </div>
   </VModal>