diff --git a/src/components/Metadata.vue b/src/components/Metadata.vue
index d3f5029e..f06c0b16 100644
--- a/src/components/Metadata.vue
+++ b/src/components/Metadata.vue
@@ -148,13 +148,16 @@ export default class Metadata extends Mixins(GlobalMixin) {
       });
     }
 
+    const title = this.exif?.["Title"];
     const desc = this.exif?.["Description"];
-    list.push({
-      title: this.exif?.["Title"] || this.t("memories", "No title"),
-      subtitle: [desc || this.t("memories", "No description")],
-      icon: InfoIcon,
-      edit: () => globalThis.editExif(globalThis.currentViewerPhoto),
-    });
+    if (title || desc) {
+      list.push({
+        title: title || this.t("memories", "No title"),
+        subtitle: [desc || this.t("memories", "No description")],
+        icon: InfoIcon,
+        edit: () => globalThis.editExif(globalThis.currentViewerPhoto),
+      });
+    }
 
     if (this.address) {
       list.push({
diff --git a/src/components/SelectionManager.vue b/src/components/SelectionManager.vue
index 61a38014..002fcfd3 100644
--- a/src/components/SelectionManager.vue
+++ b/src/components/SelectionManager.vue
@@ -79,7 +79,7 @@ import AddToAlbumModal from "./modal/AddToAlbumModal.vue";
 import StarIcon from "vue-material-design-icons/Star.vue";
 import DownloadIcon from "vue-material-design-icons/Download.vue";
 import DeleteIcon from "vue-material-design-icons/TrashCanOutline.vue";
-import EditIcon from "vue-material-design-icons/Pencil.vue";
+import EditFileIcon from "vue-material-design-icons/FileEdit.vue";
 import EditClockIcon from "vue-material-design-icons/ClockEdit.vue";
 import ArchiveIcon from "vue-material-design-icons/PackageDown.vue";
 import UnarchiveIcon from "vue-material-design-icons/PackageUp.vue";
@@ -188,7 +188,7 @@ export default class SelectionManager extends Mixins(GlobalMixin, UserConfig) {
       },
       {
         name: t("memories", "Edit EXIF Data"),
-        icon: EditIcon,
+        icon: EditFileIcon,
         callback: this.editExifSelection.bind(this),
         if: () => this.selection.size === 1,
       },
diff --git a/src/components/viewer/Viewer.vue b/src/components/viewer/Viewer.vue
index 43d9f669..0a276e3e 100644
--- a/src/components/viewer/Viewer.vue
+++ b/src/components/viewer/Viewer.vue
@@ -121,6 +121,17 @@
               <SlideshowIcon :size="24" />
             </template>
           </NcActionButton>
+          <NcActionButton
+            :aria-label="t('memories', 'Edit EXIF Data')"
+            v-if="!routeIsPublic"
+            @click="editExif"
+            :close-after-click="true"
+          >
+            {{ t("memories", "Edit EXIF Data") }}
+            <template #icon>
+              <EditFileIcon :size="24" />
+            </template>
+          </NcActionButton>
         </NcActions>
       </div>
 
@@ -149,25 +160,23 @@
 <script lang="ts">
 import { Component, Emit, Mixins } from "vue-property-decorator";
 import GlobalMixin from "../../mixins/GlobalMixin";
-
 import { IDay, IPhoto, IRow, IRowType } from "../../types";
 
 import NcActions from "@nextcloud/vue/dist/Components/NcActions";
 import NcActionButton from "@nextcloud/vue/dist/Components/NcActionButton";
+import axios from "@nextcloud/axios";
 import { subscribe, unsubscribe } from "@nextcloud/event-bus";
 import { showError } from "@nextcloud/dialogs";
-import axios from "@nextcloud/axios";
 
-import * as dav from "../../services/DavRequests";
-import * as utils from "../../services/Utils";
 import { getPreviewUrl } from "../../services/FileUtils";
 import { getDownloadLink } from "../../services/DavRequests";
+import { API } from "../../services/API";
+import * as dav from "../../services/DavRequests";
+import * as utils from "../../services/Utils";
 
 import ImageEditor from "./ImageEditor.vue";
-
 import PhotoSwipe, { PhotoSwipeOptions } from "photoswipe";
 import "photoswipe/style.css";
-
 import PsVideo from "./PsVideo";
 import PsLivePhoto from "./PsLivePhoto";
 
@@ -180,7 +189,7 @@ import InfoIcon from "vue-material-design-icons/InformationOutline.vue";
 import OpenInNewIcon from "vue-material-design-icons/OpenInNew.vue";
 import TuneIcon from "vue-material-design-icons/Tune.vue";
 import SlideshowIcon from "vue-material-design-icons/PlayBox.vue";
-import { API } from "../../services/API";
+import EditFileIcon from "vue-material-design-icons/FileEdit.vue";
 
 const SLIDESHOW_MS = 5000;
 
@@ -198,6 +207,7 @@ const SLIDESHOW_MS = 5000;
     OpenInNewIcon,
     TuneIcon,
     SlideshowIcon,
+    EditFileIcon,
   },
 })
 export default class Viewer extends Mixins(GlobalMixin) {
@@ -1085,6 +1095,13 @@ export default class Viewer extends Mixins(GlobalMixin) {
       this.stopSlideshow();
     }
   }
+
+  /**
+   * Edit EXIF data for current photo
+   */
+  private editExif() {
+    globalThis.editExif(globalThis.currentViewerPhoto);
+  }
 }
 </script>