2 files changed, 23 insertions, 8 deletions
diff --git a/src/components/nav_panel/nav_panel.js b/src/components/nav_panel/nav_panel.js
index 8f7edb7f..eda01d35 100644
--- a/src/components/nav_panel/nav_panel.js
+++ b/src/components/nav_panel/nav_panel.js
@@ -1,18 +1,30 @@
 import { mapState } from 'vuex'
 
+const timelineRoutes = [
+  'friends',
+  'dms',
+  'public-timeline',
+  'public-external-timeline'
+]
+
 const NavPanel = {
   created () {
     if (this.currentUser && this.currentUser.locked) {
       this.$store.dispatch('startFetchingFollowRequests')
     }
   },
-  computed: mapState({
-    currentUser: state => state.users.currentUser,
-    chat: state => state.chat.channel,
-    followRequestCount: state => state.api.followRequests.length,
-    privateMode: state => state.instance.private,
-    federating: state => state.instance.federating
-  })
+  computed: {
+    onTimelineRoute () {
+      return timelineRoutes.includes(this.$route.name)
+    },
+    ...mapState({
+      currentUser: state => state.users.currentUser,
+      chat: state => state.chat.channel,
+      followRequestCount: state => state.api.followRequests.length,
+      privateMode: state => state.instance.private,
+      federating: state => state.instance.federating
+    })
+  }
 }
 
 export default NavPanel
diff --git a/src/components/nav_panel/nav_panel.vue b/src/components/nav_panel/nav_panel.vue
index ed70f019..1622eafa 100644
--- a/src/components/nav_panel/nav_panel.vue
+++ b/src/components/nav_panel/nav_panel.vue
@@ -3,7 +3,10 @@
     <div class="panel panel-default">
       <ul>
         <li v-if="currentUser">
-          <router-link :to="{ name: 'friends' }">
+          <router-link
+            :to="{ name: 'friends' }"
+            :class="onTimelineRoute && 'router-link-active'"
+          >
             <i class="button-icon icon-home-2" /> {{ $t("nav.timeline") }}
           </router-link>
         </li>