diff --git a/frontend/src/component/p-photo-details.vue b/frontend/src/component/p-photo-details.vue
index 10f387d02..d6e757edd 100644
--- a/frontend/src/component/p-photo-details.vue
+++ b/frontend/src/component/p-photo-details.vue
@@ -41,7 +41,7 @@
                             <v-btn v-if="hover || $clipboard.has(photo)" :flat="!hover" :ripple="false"
                                    icon large absolute
                                    class="p-photo-select"
-                                   @click.stop.prevent="select(photo)">
+                                   @click.stop.prevent="$clipboard.toggle(photo)">
                                 <v-icon v-if="selection.length && $clipboard.has(photo)" color="white">check_circle</v-icon>
                                 <v-icon v-else color="grey lighten-3">radio_button_off</v-icon>
                             </v-btn>
diff --git a/frontend/src/component/p-photo-list.vue b/frontend/src/component/p-photo-list.vue
index d44552639..a860400cc 100644
--- a/frontend/src/component/p-photo-list.vue
+++ b/frontend/src/component/p-photo-list.vue
@@ -13,7 +13,7 @@
             <td>
                 <v-btn icon small :ripple="false"
                        class="p-photo-select"
-                       @click.stop.prevent="select(props.item)">
+                       @click.stop.prevent="$clipboard.toggle(photo)">
                     <v-icon v-if="selection.length && $clipboard.has(props.item)" color="grey darken-2">check_circle</v-icon>
                     <v-icon v-else-if="!$clipboard.has(props.item)" color="grey lighten-4">radio_button_off</v-icon>
                 </v-btn>
diff --git a/frontend/src/component/p-photo-mosaic.vue b/frontend/src/component/p-photo-mosaic.vue
index 9711dfd0f..ccdd8d62e 100644
--- a/frontend/src/component/p-photo-mosaic.vue
+++ b/frontend/src/component/p-photo-mosaic.vue
@@ -39,7 +39,7 @@
                             <v-btn v-if="hover || $clipboard.has(photo)" :flat="!hover" :ripple="false"
                                    icon small absolute
                                    class="p-photo-select"
-                                   @click.stop.prevent="select(photo)">
+                                   @click.stop.prevent="$clipboard.toggle(photo)">
                                 <v-icon v-if="selection.length && $clipboard.has(photo)" color="white">check_circle</v-icon>
                                 <v-icon v-else color="grey lighten-3">radio_button_off</v-icon>
                             </v-btn>
diff --git a/frontend/src/component/p-photo-tiles.vue b/frontend/src/component/p-photo-tiles.vue
index 78bea3b08..17a36769b 100644
--- a/frontend/src/component/p-photo-tiles.vue
+++ b/frontend/src/component/p-photo-tiles.vue
@@ -39,7 +39,7 @@
                             <v-btn v-if="hover || $clipboard.has(photo)" :flat="!hover" :ripple="false"
                                    icon large absolute
                                    class="p-photo-select"
-                                   @click.stop.prevent="select(photo)">
+                                   @click.stop.prevent="$clipboard.toggle(photo)">
                                 <v-icon v-if="selection.length && $clipboard.has(photo)" color="white">check_circle</v-icon>
                                 <v-icon v-else-if="!$clipboard.has(photo)" color="grey lighten-3">radio_button_off</v-icon>
                             </v-btn>
diff --git a/frontend/src/pages/photos.vue b/frontend/src/pages/photos.vue
index 04159c37a..187913c19 100644
--- a/frontend/src/pages/photos.vue
+++ b/frontend/src/pages/photos.vue
@@ -146,7 +146,7 @@
                         dark
                         small
                         color="grey"
-                        @click.stop="clearSelection()"
+                        @click.stop="$clipboard.clear()"
                         :disabled="!selected.length"
                 >
                     <v-icon>clear</v-icon>
@@ -247,10 +247,6 @@
                 this.$alert.warning("Not implemented yet");
                 this.menuVisible = false;
             },
-            clearSelection() {
-                this.selected = [];
-                this.menuVisible = false;
-            },
             selectPhoto(photo) {
                 this.$clipboard.toggle(photo);
             },