diff --git a/client/src/components/content-blocks/assignment/Assignment.vue b/client/src/components/content-blocks/assignment/Assignment.vue
index bbc3736b..853bec36 100644
--- a/client/src/components/content-blocks/assignment/Assignment.vue
+++ b/client/src/components/content-blocks/assignment/Assignment.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="assignment">
+  <div class="assignment" :data-scrollto="assignment.id">
     <p class="assignment__assignment-text">
       {{assignment.assignment}}
     </p>
diff --git a/client/src/pages/module.vue b/client/src/pages/module.vue
index 590ca32b..be5f5496 100644
--- a/client/src/pages/module.vue
+++ b/client/src/pages/module.vue
@@ -46,7 +46,7 @@
         if (mutation.type === 'setScrollToAssignmentReady' && mutation.payload && !this.isScrollingToAssignment) {
           this.scrollingToAssignment(true);
           let options = {
-            container: '#app',
+            container: 'body',
             easing: 'ease',
             offset: -60,
             onStart: (element) => {
@@ -62,7 +62,7 @@
             y: true
           };
           setTimeout(() => {
-            this.$scrollTo(`#${this.scrollToAssignmentId.replace(/=/g, '')}`, 1000, options);
+            this.$scrollTo(`[data-scrollto="${this.scrollToAssignmentId}"]`, 1000, options);
             }, 250) // unfortunately this timeout is needed as it is hard to tell when everything is rendered
         }
       })