diff --git a/src/pages/gallery/components/CollectionSelector.tsx b/src/pages/gallery/components/CollectionSelector.tsx
index 2cb1b13a4..541789dbc 100644
--- a/src/pages/gallery/components/CollectionSelector.tsx
+++ b/src/pages/gallery/components/CollectionSelector.tsx
@@ -55,7 +55,10 @@ function CollectionSelector({
         (item) => (
             <CollectionIcon
                 key={item.collection.id}
-                onClick={attributes.callback.bind(null, item.collection)}
+                onClick={() => {
+                    attributes.callback(item.collection);
+                    props.onHide();
+                }}
             >
                 <Card>
                     <PreviewCard
diff --git a/src/pages/gallery/index.tsx b/src/pages/gallery/index.tsx
index b178ae928..2c8547d09 100644
--- a/src/pages/gallery/index.tsx
+++ b/src/pages/gallery/index.tsx
@@ -484,7 +484,10 @@ export default function Gallery() {
             />
             <CollectionNamer
                 show={collectionNamerView}
-                onHide={setCollectionNamerView.bind(null, false)}
+                onHide={() => {
+                    setCollectionNamerView(false);
+                    setCollectionSelectorView(false);
+                }}
                 attributes={collectionNamerAttributes}
             />
             <CollectionSelector