diff --git a/public/index.html b/public/index.html
index fc66f8b..7c97cce 100644
--- a/public/index.html
+++ b/public/index.html
@@ -5,7 +5,7 @@
   <meta content="IE=edge" http-equiv="X-UA-Compatible">
   <meta content="width=device-width,initial-scale=1.0" name="viewport">
   <link href="<%= BASE_URL %>favicon.ico" rel="icon">
-  <title><%= htmlWebpackPlugin.options.title %></title>
+  <title>Home</title>
 </head>
 <body>
 <noscript>
diff --git a/src/App.vue b/src/App.vue
index 63cae3c..acf1b2b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -51,6 +51,13 @@ export default class App extends Vue
 
     updateBookmark(to: RouteLocationNormalized): void
     {
+        // Update title
+        // Use next tick to handle router history correctly
+        // see: https://github.com/vuejs/vue-router/issues/914#issuecomment-384477609
+        this.$nextTick(() => {
+            document.title = to.meta.title ? `Hykilpikonna - ${to.meta.title}` : 'Hykilpikonna - Home';
+        })
+
         console.log('AfterEach called', to)
         this.currentRoute = (to.name as string).toLowerCase()
 
diff --git a/src/scripts/router.ts b/src/scripts/router.ts
index 7f642c6..6cfff39 100644
--- a/src/scripts/router.ts
+++ b/src/scripts/router.ts
@@ -5,16 +5,19 @@ const routes: Array<RouteRecordRaw> = [
     {
         path: '/',
         name: 'Home',
+        meta: {title: 'Home'},
         component: Home
     },
     {
         path: '/new-home',
         name: 'New Home',
+        meta: {title: 'Home'},
         component: () => import('../views/NewHome.vue')
     },
     {
         path: '/about',
         name: 'About',
+        meta: {title: 'About Me'},
         // route level code-splitting
         // this generates a separate chunk (about.[hash].js) for this route
         // which is lazy-loaded when the route is visited.
@@ -23,16 +26,19 @@ const routes: Array<RouteRecordRaw> = [
     {
         path: '/life',
         name: 'Life',
+        meta: {title: 'Life'},
         component: () => import('../views/Life.vue')
     },
     {
         path: '/color',
         name: 'ColorPicker',
+        meta: {title: 'Color Picker'},
         component: () => import('../components/color/ColorPickerTest.vue')
     },
     {
         path: '/projects',
         name: 'Projects',
+        meta: {title: 'Projects'},
         component: () => import('../views/Projects.vue')
     }
 ]
