diff --git a/app/src/App.vue b/app/src/App.vue
index b320c6d6..f205e207 100644
--- a/app/src/App.vue
+++ b/app/src/App.vue
@@ -86,33 +86,17 @@ export default {
     ViewLockOverlay
   },
 
-  data () {
-    return {
-      transitionName: null
-    }
-  },
-
   computed: {
     ...mapGetters([
       'connected',
       'yunohost',
       'routerKey',
       'transitions',
+      'transitionName',
       'waiting'
     ])
   },
 
-  watch: {
-    // Set the css class to animate the components transition
-    '$route' (to, from) {
-      if (!this.transitions || from.name === null) return
-      // Use the breadcrumb array length as a direction indicator
-      const toDepth = to.meta.breadcrumb.length
-      const fromDepth = from.meta.breadcrumb.length
-      this.transitionName = toDepth < fromDepth ? 'slide-right' : 'slide-left'
-    }
-  },
-
   methods: {
     async logout () {
       this.$store.dispatch('LOGOUT')
diff --git a/app/src/router/index.js b/app/src/router/index.js
index 7873dbe9..9530f8f9 100644
--- a/app/src/router/index.js
+++ b/app/src/router/index.js
@@ -30,6 +30,10 @@ const router = new VueRouter({
 router.beforeEach((to, from, next) => {
   store.dispatch('UPDATE_ROUTER_KEY', { to, from })
   store.dispatch('UPDATE_BREADCRUMB', { to, from })
+  if (store.getters.transitions && from.name !== null) {
+    store.dispatch('UPDATE_TRANSITION_NAME', { to, from })
+  }
+
   if (store.getters.error) {
     store.dispatch('DISMISS_ERROR', true)
   }
diff --git a/app/src/store/info.js b/app/src/store/info.js
index f557fe1c..1304c1ed 100644
--- a/app/src/store/info.js
+++ b/app/src/store/info.js
@@ -17,7 +17,8 @@ export default {
     historyTimer: null, // null || setTimeout id
     tempMessages: [], // Array of messages
     routerKey: undefined, // String if current route has params
-    breadcrumb: [] // Array of routes
+    breadcrumb: [], // Array of routes
+    transitionName: null // String of CSS class if transitions are enabled
   },
 
   mutations: {
@@ -97,6 +98,10 @@ export default {
 
     'SET_BREADCRUMB' (state, breadcrumb) {
       state.breadcrumb = breadcrumb
+    },
+
+    'SET_TRANSITION_NAME' (state, transitionName) {
+      state.transitionName = transitionName
     }
   },
 
@@ -333,6 +338,13 @@ export default {
 
       // Display a simplified breadcrumb as the document title.
       document.title = `${getTitle(breadcrumb)} | ${i18n.t('yunohost_admin')}`
+    },
+
+    'UPDATE_TRANSITION_NAME' ({ state, commit }, { to, from }) {
+      // Use the breadcrumb array length as a direction indicator
+      const toDepth = (to.meta.breadcrumb || []).length
+      const fromDepth = (from.meta.breadcrumb || []).length
+      commit('SET_TRANSITION_NAME', toDepth < fromDepth ? 'slide-right' : 'slide-left')
     }
   },
 
@@ -350,6 +362,7 @@ export default {
       return request || state.requests[state.requests.length - 1]
     },
     routerKey: state => state.routerKey,
-    breadcrumb: state => state.breadcrumb
+    breadcrumb: state => state.breadcrumb,
+    transitionName: state => state.transitionName
   }
 }