2 files changed, 11 insertions, 1 deletions

diff --git a/viewer/src/components/LdCommand.vue b/viewer/src/components/LdCommand.vue
index c0b86be..367e08f 100644
--- a/viewer/src/components/LdCommand.vue
+++ b/viewer/src/components/LdCommand.vue
@@ -23,7 +23,12 @@
     <a class="link" :title="$t('command.search')" @click="$uiStore.toggleFullWidth()">
       <fa-icon :icon="commandToggleSearchPanelIcon()" size="lg" />
     </a>
-    <a class="link command-secondary" :title="$t('command.back')" @click="$router.go(-1)">
+    <a
+      :class="{'disabled': isEntryPoint()}"
+      class="link command-secondary"
+      :title="$t('command.back')"
+      @click="isEntryPoint() || $router.back()"
+    >
       <fa-icon icon="arrow-left" size="lg" />
     </a>
     <router-link :class="{'disabled': isRoot()}" :title="$t('command.parent')" :to="parent()">
@@ -49,6 +54,10 @@ export default class LdCommand extends Vue {
     return this.currentItemPath.length <= 1 && !this.$uiStore.searchMode;
   }
 
+  isEntryPoint(): boolean {
+    return history.state.ldgallery === "ENTRYPOINT"; // Set by MainLayout.vue
+  }
+
   parent(): RawLocation {
     if (this.$uiStore.searchMode) return this.$route.path;
     if (this.currentItemPath.length > 1) return this.currentItemPath[this.currentItemPath.length - 2];
diff --git a/viewer/src/views/MainLayout.vue b/viewer/src/views/MainLayout.vue
index 272c045..2d74db9 100644
--- a/viewer/src/views/MainLayout.vue
+++ b/viewer/src/views/MainLayout.vue
@@ -43,6 +43,7 @@ export default class MainLayout extends Vue {
   scrollPositions: ScrollPosition = {};
 
   mounted() {
+    history.replaceState({ ldgallery: "ENTRYPOINT" }, "");
     this.fetchGalleryItems();
   }