diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
index 07cf650d..5df17e23 100644
--- a/lib/Controller/PageController.php
+++ b/lib/Controller/PageController.php
@@ -87,6 +87,7 @@ class PageController extends Controller
         // Apps enabled
         $this->initialState->provideInitialState('systemtags', true === $this->appManager->isEnabledForUser('systemtags'));
         $this->initialState->provideInitialState('recognize', true === $this->appManager->isEnabledForUser('recognize'));
+        $this->initialState->provideInitialState('maps', true === $this->appManager->isEnabledForUser('maps'));
         $this->initialState->provideInitialState('version', $this->appManager->getAppInfo('memories')['version']);
 
         $policy = new ContentSecurityPolicy();
diff --git a/src/App.vue b/src/App.vue
index 1b38abc2..a316e631 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -39,6 +39,10 @@
                     :title="t('memories', 'Tags')">
                     <TagsIcon slot="icon" :size="20" />
                 </NcAppNavigationItem>
+                <NcAppNavigationItem :to="{name: 'maps'}" v-if="config_mapsEnabled"
+                    :title="t('memories', 'Maps')">
+                    <MapIcon slot="icon" :size="20" />
+                </NcAppNavigationItem>
             </template>
             <template #footer>
                 <NcAppNavigationSettings :title="t('memories', 'Settings')">
@@ -78,6 +82,7 @@ import ArchiveIcon from 'vue-material-design-icons/PackageDown.vue';
 import CalendarIcon from 'vue-material-design-icons/Calendar.vue';
 import PeopleIcon from 'vue-material-design-icons/AccountBoxMultiple.vue';
 import TagsIcon from 'vue-material-design-icons/Tag.vue';
+import MapIcon from 'vue-material-design-icons/Map.vue';
 
 @Component({
     components: {
@@ -99,6 +104,7 @@ import TagsIcon from 'vue-material-design-icons/Tag.vue';
         CalendarIcon,
         PeopleIcon,
         TagsIcon,
+        MapIcon,
     },
 })
 export default class App extends Mixins(GlobalMixin, UserConfig) {
diff --git a/src/mixins/UserConfig.ts b/src/mixins/UserConfig.ts
index a5db7c3c..62f2ece0 100644
--- a/src/mixins/UserConfig.ts
+++ b/src/mixins/UserConfig.ts
@@ -34,8 +34,10 @@ export default class UserConfig extends Vue {
     config_timelinePath: string = loadState('memories', 'timelinePath') || '';
     config_foldersPath: string = loadState('memories', 'foldersPath') || '/';
     config_showHidden = loadState('memories', 'showHidden') === "true";
+
     config_tagsEnabled = Boolean(loadState('memories', 'systemtags'));
     config_recognizeEnabled = Boolean(loadState('memories', 'recognize'));
+    config_mapsEnabled = Boolean(loadState('memories', 'maps'));
 
     config_squareThumbs = localStorage.getItem('memories_squareThumbs') === '1';
     config_showFaceRect = localStorage.getItem('memories_showFaceRect') === '1';
diff --git a/src/router.ts b/src/router.ts
index 35fd061b..3a0c527d 100644
--- a/src/router.ts
+++ b/src/router.ts
@@ -117,5 +117,14 @@
                 rootTitle: t('memories', 'Tags'),
             }),
         },
+
+        {
+			path: '/maps',
+			name: 'maps',
+			// router-link doesn't support external url, let's force the redirect
+			beforeEnter() {
+				window.open(generateUrl('/apps/maps'), '_blank')
+			},
+		},
      ],
  })
\ No newline at end of file