diff --git a/src/devtools/views/router/RouterHistory.vue b/src/devtools/views/router/RouterHistory.vue
index 4e6cdb69f9..ce059ff32d 100644
--- a/src/devtools/views/router/RouterHistory.vue
+++ b/src/devtools/views/router/RouterHistory.vue
@@ -54,7 +54,7 @@
           class="entry list-item"
           :class="{ active: inspectedIndex === index }"
           :data-active="active"
-          @click="inspect(filteredRoutes.indexOf(route))"
+          @click="inspect(routeChanges.indexOf(route))"
         >
           <span class="route-name">{{ route.to.path }}</span>
           <span class="time">{{ route.timestamp | formatTime }}</span>
diff --git a/src/devtools/views/routes/RoutesTree.vue b/src/devtools/views/routes/RoutesTree.vue
index 5fb09423d0..4d4abd7992 100644
--- a/src/devtools/views/routes/RoutesTree.vue
+++ b/src/devtools/views/routes/RoutesTree.vue
@@ -18,11 +18,11 @@
       }"
     >
       <routes-tree-item
-        v-for="(route, index) in filteredRoutes"
+        v-for="route in filteredRoutes"
         ref="instances"
         :key="route.path"
         :route="route"
-        :route-id="index"
+        :route-id="routeChanges.indexOf(route)"
         :depth="0"
       />
     </div>
@@ -34,7 +34,7 @@ import ScrollPane from 'components/ScrollPane.vue'
 import ActionHeader from 'components/ActionHeader.vue'
 import RoutesTreeItem from './RoutesTreeItem.vue'
 
-import { mapGetters } from 'vuex'
+import { mapGetters, mapState } from 'vuex'
 
 export default {
   components: {
@@ -44,6 +44,10 @@ export default {
   },
 
   computed: {
+    ...mapState('routes', [
+      'routeChanges'
+    ]),
+
     ...mapGetters('routes', [
       'filteredRoutes'
     ]),