diff --git a/core/modules/macros/list/listviews/classic.js b/core/modules/macros/list/listviews/classic.js
index c2a8a8b26..60ac5d864 100644
--- a/core/modules/macros/list/listviews/classic.js
+++ b/core/modules/macros/list/listviews/classic.js
@@ -57,7 +57,7 @@ $tw.utils.forceLayout(targetElement);
 		{transform: "none"}
 	]);
 	// Scroll the target element into view
-	$tw.scroller.scrollIntoView(targetElement);
+	$tw.scroller.scrollIntoView(dstRect);
 };
 
 ClassicListView.prototype.insert = function(index) {
diff --git a/core/modules/utils/dom/scroller.js b/core/modules/utils/dom/scroller.js
index b7faa1a32..cdba1076e 100644
--- a/core/modules/utils/dom/scroller.js
+++ b/core/modules/utils/dom/scroller.js
@@ -31,16 +31,17 @@ Scroller.prototype.cancel = function() {
 
 /*
 Smoothly scroll an element back into view if needed
+	element: element or clientrect object
 */
 Scroller.prototype.scrollIntoView = function(element) {
-	var scrollPosition = $tw.utils.getScrollPosition(),
-		elementBounds = element.getBoundingClientRect();
+	var elementBounds = element instanceof HTMLElement ? $tw.utils.getBoundingPageRect(element) : element,
+		scrollPosition = $tw.utils.getScrollPosition();
 	this.cancel();
 	this.startTime = new Date();
 	this.startX = scrollPosition.x;
 	this.startY = scrollPosition.y;
-	this.endX = elementBounds.left + scrollPosition.x;
-	this.endY = elementBounds.top + scrollPosition.y;
+	this.endX = elementBounds.left;
+	this.endY = elementBounds.top;
 	if((this.endX < this.startX) || (this.endX > (this.startX + window.innerWidth)) || (this.endY < this.startY) || (this.endY > (this.startY + window.innerHeight))) {
 		var self = this;
 		this.timerId = window.setInterval(function() {