diff --git a/test/demo/m2/js/main.js b/test/demo/m2/js/main.js
index 5b6cdcee..76448fe0 100644
--- a/test/demo/m2/js/main.js
+++ b/test/demo/m2/js/main.js
@@ -152,6 +152,8 @@
                     immediately: true
                 });
 
+                self.viewer.forceRedraw();
+
                 self.viewer.svgOverlay('resize');
             });
 
@@ -354,7 +356,8 @@
             this.updateHighlight();
             this.updateHover(-1);
 
-            setTimeout(function() {
+            clearTimeout(this.scrollTimeout);
+            this.scrollTimeout = setTimeout(function() {
                 self.ignoreScroll = false;
             }, this.viewer.animationTime * 1000);
         },