1 files changed, 9 insertions, 10 deletions

diff --git a/app/Resources/static/themes/material/js/shortcuts/main.js b/app/Resources/static/themes/material/js/shortcuts/main.js
index ad4ca80a..0a2d2a69 100644
--- a/app/Resources/static/themes/material/js/shortcuts/main.js
+++ b/app/Resources/static/themes/material/js/shortcuts/main.js
@@ -8,9 +8,14 @@ function toggleFocus(cardToToogleFocus) {
 }
 
 $(document).ready(() => {
+  const cards = $('#content').find('.card');
+  const cardNumber = cards.length;
   let cardIndex = 0;
-  const cardNumber = $('#content ul.data > li').length;
-  let card = $('#content ul.data > li')[cardIndex];
+  /* If we come from next page */
+  if (window.location.hash === '#prev') {
+    cardIndex = cardNumber - 1;
+  }
+  let card = cards[cardIndex];
   const pagination = $('.pagination');
 
   /* Show nothing on quickstart */
@@ -18,12 +23,6 @@ $(document).ready(() => {
     return;
   }
 
-  /* If we come from next page */
-  if (window.location.hash === '#prev') {
-    cardIndex = cardNumber - 1;
-    card = $('ul.data > li')[cardIndex];
-  }
-
   /* Focus current card */
   toggleFocus(card);
 
@@ -47,7 +46,7 @@ $(document).ready(() => {
     if (cardIndex >= 0 && cardIndex < cardNumber - 1) {
       toggleFocus(card);
       cardIndex += 1;
-      card = $('ul.data > li')[cardIndex];
+      card = cards[cardIndex];
       toggleFocus(card);
       return;
     }
@@ -61,7 +60,7 @@ $(document).ready(() => {
     if (cardIndex > 0 && cardIndex < cardNumber) {
       toggleFocus(card);
       cardIndex -= 1;
-      card = $('ul.data > li')[cardIndex];
+      card = cards[cardIndex];
       toggleFocus(card);
       return;
     }