diff --git a/test/demo/m2/README.md b/test/demo/m2/README.md
index ba5bae88..ef92c45c 100644
--- a/test/demo/m2/README.md
+++ b/test/demo/m2/README.md
@@ -1,5 +1,4 @@
 # To Do
 
-* When going to thumbs, scroll to the proper part of the page
 * Support 400+ page collections
 * Show/hide pages?
diff --git a/test/demo/m2/index.html b/test/demo/m2/index.html
index 90559ee1..7c6ef773 100644
--- a/test/demo/m2/index.html
+++ b/test/demo/m2/index.html
@@ -43,7 +43,7 @@
                 background: white;
             }
 
-            .openseadragon1.full {
+            .viewer-position {
                 position: absolute;
                 left: 0;
                 top: 30px;
@@ -51,7 +51,10 @@
                 bottom: 0;
             }
 
-            .openseadragon1.thumbs {
+            .scroll-cover {
+                display: none;
+                overflow: scroll;
+                z-index: 100;
             }
 
         </style>
@@ -67,6 +70,9 @@
                 <button class="next">Next</button>
             </div>
         </div>
-        <div id="contentDiv" class="openseadragon1"></div>
+        <div id="contentDiv" class="openseadragon1 viewer-position"></div>
+        <div class="scroll-cover viewer-position">
+            <div class="scroll-inner"></div>
+        </div>
     </body>
 </html>
diff --git a/test/demo/m2/js/main.js b/test/demo/m2/js/main.js
index d7628d46..5b6cdcee 100644
--- a/test/demo/m2/js/main.js
+++ b/test/demo/m2/js/main.js
@@ -20,6 +20,25 @@
                 'page'
             ];
 
+            var highsmith = {
+                Image: {
+                    xmlns: "http://schemas.microsoft.com/deepzoom/2008",
+                    Url: "http://openseadragon.github.io/example-images/highsmith/highsmith_files/",
+                    Format: "jpg",
+                    Overlap: "2",
+                    TileSize: "256",
+                    Size: {
+                        Height: "9221",
+                        Width:  "7026"
+                    }
+                }
+            };
+
+            // this.tileSources = [];
+            // for (var i = 0; i < count; i++) {
+            //     this.tileSources.push(highsmith);
+            // }
+
             this.viewer = OpenSeadragon({
                 id: "contentDiv",
                 prefixUrl: "../../../build/openseadragon/images/",
@@ -37,21 +56,6 @@
                 });
             });
 
-            this.viewer.addHandler('canvas-click', function(event) {
-                if (self.mode !== 'thumbs' || !event.quick) {
-                    return;
-                }
-
-                var pos = self.viewer.viewport.pointFromPixel(event.position);
-                var result = self.hitTest(pos);
-                if (result) {
-                    self.setMode({
-                        mode: 'page',
-                        page: result.index
-                    });
-                }
-            });
-
             this.viewer.addHandler('canvas-drag', function() {
                 if (this.mode === 'scroll') {
                     var result = this.hitTest(this.viewer.viewport.getCenter());
@@ -65,18 +69,6 @@
                 self.applyConstraints();
             });
 
-            var tracker = new OpenSeadragon.MouseTracker({
-                element: this.viewer.container,
-                moveHandler: function(event) {
-                    if (self.mode === 'thumbs') {
-                        var result = self.hitTest(self.viewer.viewport.pointFromPixel(event.position));
-                        self.updateHover(result ? result.index : -1);
-                    }
-                }
-            });
-
-            tracker.setTracking(true);
-
             $.each(this.modeNames, function(i, v) {
                 $('.' + v).click(function() {
                     self.setMode({
@@ -105,6 +97,37 @@
                 }
             });
 
+            this.$scrollInner = $('.scroll-inner');
+
+            this.$scrollCover = $('.scroll-cover')
+                .scroll(function(event) {
+                    var info = self.getScrollInfo();
+                    if (!info || self.ignoreScroll) {
+                        return;
+                    }
+
+                    var pos = new OpenSeadragon.Point(info.thumbBounds.getCenter().x,
+                        info.thumbBounds.y + (info.viewportHeight / 2) +
+                        (info.viewportMax * info.scrollFactor));
+
+                    self.viewer.viewport.panTo(pos, true);
+                })
+                .mousemove(function(event) {
+                    var pixel = new OpenSeadragon.Point(event.clientX, event.clientY);
+                    var result = self.hitTest(self.viewer.viewport.pointFromPixel(pixel));
+                    self.updateHover(result ? result.index : -1);
+                })
+                .click(function(event) {
+                    var pixel = new OpenSeadragon.Point(event.clientX, event.clientY);
+                    var result = self.hitTest(self.viewer.viewport.pointFromPixel(pixel));
+                    if (result) {
+                        self.setMode({
+                            mode: 'page',
+                            page: result.index
+                        });
+                    }
+                });
+
             var svgNode = this.viewer.svgOverlay();
 
             this.highlight = d3.select(svgNode).append("rect")
@@ -179,6 +202,26 @@
             return null;
         },
 
+        // ----------
+        getScrollInfo: function() {
+            if (!this.thumbBounds) {
+                return null;
+            }
+
+            var output = {};
+
+            var viewerWidth = this.$el.width();
+            var viewerHeight = this.$el.height();
+            var scrollTop = this.$scrollCover.scrollTop();
+            output.scrollMax = this.$scrollInner.height() - this.$scrollCover.height();
+            output.scrollFactor = (output.scrollMax > 0 ? scrollTop / output.scrollMax : 0);
+
+            output.thumbBounds = this.thumbBounds;
+            output.viewportHeight = output.thumbBounds.width * (viewerHeight / viewerWidth);
+            output.viewportMax = Math.max(0, output.thumbBounds.height - output.viewportHeight);
+            return output;
+        },
+
         // ----------
         update: function() {
             var self = this;
@@ -237,13 +280,10 @@
                 this.page = config.page; // Need to do this before layout
             }
 
-            var layout = this.createLayout();
+            this.ignoreScroll = true;
+            this.thumbBounds = null;
 
-            var oldSize = new OpenSeadragon.Point(this.$el.width(), this.$el.height());
-            var oldBounds = this.viewer.viewport.getBounds();
-            var scrollTop = $(window).scrollTop();
-            var scrollMax = $(document).height() - $(window).height();
-            var scrollFactor = (scrollMax > 0 ? scrollTop / scrollMax : 0);
+            var layout = this.createLayout();
 
             if (this.mode === 'thumbs') {
                 this.viewer.gestureSettingsMouse.scrollToZoom = false;
@@ -254,9 +294,8 @@
                 var width = layout.bounds.width + (this.bigBuffer * 2);
                 var height = layout.bounds.height + (this.bigBuffer * 2);
                 var newHeight = viewerWidth * (height / width);
-                this.$el
-                    .addClass('thumbs')
-                    .removeClass('full')
+                this.$scrollCover.show();
+                this.$scrollInner
                     .css({
                         height: newHeight
                     });
@@ -265,25 +304,7 @@
                 this.viewer.zoomPerClick = 2;
                 this.viewer.panHorizontal = true;
                 this.viewer.panVertical = true;
-                this.$el
-                    .addClass('full')
-                    .removeClass('thumbs')
-                    .css({
-                        height: 'auto'
-                    });
-            }
-
-            var newSize = new OpenSeadragon.Point(this.$el.width(), this.$el.height());
-            if (oldSize.x !== newSize.x || oldSize.y !== newSize.y) {
-                this.viewer.viewport.resize(newSize, false);
-                var newBounds = this.viewer.viewport.getBounds();
-                var box = oldBounds.clone();
-                box.height = box.width * (newBounds.height / newBounds.width);
-
-                var boxMax = oldBounds.height - box.height;
-                box.y += boxMax * scrollFactor;
-                this.viewer.viewport.fitBounds(box, true);
-                this.viewer.viewport.update();
+                this.$scrollCover.hide();
             }
 
             this.setLayout({
@@ -291,6 +312,38 @@
                 immediately: config.immediately
             });
 
+            if (this.mode === 'thumbs') {
+                // Set up thumbBounds
+                this.thumbBounds = this.viewer.world.getHomeBounds();
+                this.thumbBounds.x -= this.bigBuffer;
+                this.thumbBounds.y -= this.bigBuffer;
+                this.thumbBounds.width += (this.bigBuffer * 2);
+                this.thumbBounds.height += (this.bigBuffer * 2);
+
+                // Scroll to the appropriate location
+                var info = this.getScrollInfo();
+
+                var viewportBounds = this.thumbBounds.clone();
+                viewportBounds.y += info.viewportMax * info.scrollFactor;
+                viewportBounds.height = info.viewportHeight;
+
+                var itemBounds = this.viewer.world.getItemAt(this.page).getBounds();
+                var top = itemBounds.y - this.bigBuffer;
+                var bottom = top + itemBounds.height + (this.bigBuffer * 2);
+
+                var normalY;
+                if (top < viewportBounds.y) {
+                    normalY = top - this.thumbBounds.y;
+                } else if (bottom > viewportBounds.y + viewportBounds.height) {
+                    normalY = (bottom - info.viewportHeight) - this.thumbBounds.y;
+                }
+
+                if (normalY !== undefined) {
+                    var viewportFactor = normalY / info.viewportMax;
+                    this.$scrollCover.scrollTop(info.scrollMax * viewportFactor);
+                }
+            }
+
             this.goHome({
                 immediately: config.immediately
             });
@@ -300,6 +353,10 @@
             this.update();
             this.updateHighlight();
             this.updateHover(-1);
+
+            setTimeout(function() {
+                self.ignoreScroll = false;
+            }, this.viewer.animationTime * 1000);
         },
 
         // ----------
@@ -324,14 +381,14 @@
         updateHover: function(page) {
             if (page === -1 || this.mode !== 'thumbs') {
                 this.hover.style('opacity', 0);
-                this.$el.css({
+                this.$scrollCover.css({
                     'cursor': 'default'
                 });
 
                 return;
             }
 
-            this.$el.css({
+            this.$scrollCover.css({
                 'cursor': 'pointer'
             });
 
@@ -527,13 +584,11 @@
             var viewerHeight = this.$el.height();
             var layoutConfig = {};
 
-            var box;
             if (this.mode === 'thumbs') {
-                box = this.viewer.world.getHomeBounds();
-                box.x -= this.bigBuffer;
-                box.y -= this.bigBuffer;
-                box.width += (this.bigBuffer * 2);
+                var info = this.getScrollInfo();
+                var box = this.thumbBounds.clone();
                 box.height = box.width * (viewerHeight / viewerWidth);
+                box.y += info.viewportMax * info.scrollFactor;
                 this.viewer.viewport.fitBounds(box, config.immediately);
             } else {
                 this.goToPage({