diff --git a/src/components/Collections/CollectionSelector/index.tsx b/src/components/Collections/CollectionSelector/index.tsx
index 64107d516..de65a9d03 100644
--- a/src/components/Collections/CollectionSelector/index.tsx
+++ b/src/components/Collections/CollectionSelector/index.tsx
@@ -19,7 +19,7 @@ export interface CollectionSelectorAttributes {
 
 interface Props {
     open: boolean;
-    onClose: (closeBtnClick?: boolean) => void;
+    onClose: () => void;
     attributes: CollectionSelectorAttributes;
     collections: Collection[];
     collectionSummaries: CollectionSummaries;
@@ -62,18 +62,18 @@ function CollectionSelector({
         props.onClose();
     };
 
-    const onCloseButtonClick = () => {
+    const onUserTriggeredClose = () => {
         attributes.onCancel?.();
-        props.onClose(true);
+        props.onClose();
     };
 
     return (
         <AllCollectionDialog
-            onClose={props.onClose}
+            onClose={onUserTriggeredClose}
             open={props.open}
             position="center"
             fullScreen={appContext.isMobile}>
-            <DialogTitleWithCloseButton onClose={onCloseButtonClick}>
+            <DialogTitleWithCloseButton onClose={onUserTriggeredClose}>
                 {attributes.title}
             </DialogTitleWithCloseButton>
             <DialogContent>
diff --git a/src/components/Upload/Uploader.tsx b/src/components/Upload/Uploader.tsx
index 1be6baf90..179543b29 100644
--- a/src/components/Upload/Uploader.tsx
+++ b/src/components/Upload/Uploader.tsx
@@ -142,6 +142,7 @@ export default function Uploader(props: Props) {
     };
     const handleCollectionSelectorCancel = () => {
         uploadRunning.current = false;
+        appContext.resetSharedFiles();
     };
 
     const handleUserNameInputDialogClose = () => {
diff --git a/src/pages/gallery/index.tsx b/src/pages/gallery/index.tsx
index 78352e189..c34a78db5 100644
--- a/src/pages/gallery/index.tsx
+++ b/src/pages/gallery/index.tsx
@@ -525,13 +525,6 @@ export default function Gallery() {
         }
     };
 
-    const closeCollectionSelector = (closeBtnClick?: boolean) => {
-        if (closeBtnClick === true) {
-            appContext.resetSharedFiles();
-        }
-        setCollectionSelectorView(false);
-    };
-
     const fixTimeHelper = async () => {
         const selectedFiles = getSelectedFiles(selected, files);
         setFixCreationTimeAttributes({ files: selectedFiles });
@@ -555,6 +548,10 @@ export default function Gallery() {
         setUploadTypeSelectorView(true);
     };
 
+    const closeCollectionSelector = () => {
+        setCollectionSelectorView(false);
+    };
+
     return (
         <GalleryContext.Provider
             value={{