diff --git a/service.js b/service.js
index 5c4f867..4102b71 100644
--- a/service.js
+++ b/service.js
@@ -527,10 +527,9 @@ class BesService {
 
     if (service.scrollTimeout) clearTimeout(service.scrollTimeout)
     service.scrollTimeout = setTimeout(() => {
-      console.log('Scrolling stop')
       service.repositionMistakes()
       service.scrollTimeout = null
-    }, 200)
+    }, 500)
   }
 
   /**
@@ -1191,9 +1190,12 @@ window.onscroll = () => {
   besServices.forEach(service => {
     service.scrollPanel.style.top = -service.hostElement.scrollTop + 'px'
     service.offsetTop = service.hostElement.scrollTop
-    // setTimeout(() => {
-    //   service.repositionMistakes()
-    // }, 100)
+
+    if (service.windowScrollTimeout) clearTimeout(service.windowScrollTimeout)
+    service.windowScrollTimeout = setTimeout(() => {
+      service.repositionMistakes()
+      service.windowScrollTimeout = null
+    }, 300)
   })
 }