diff --git a/src/components/structures/ScrollPanel.js b/src/components/structures/ScrollPanel.js
index 9d0bfce6cb..5ddc0e0028 100644
--- a/src/components/structures/ScrollPanel.js
+++ b/src/components/structures/ScrollPanel.js
@@ -555,7 +555,7 @@ module.exports = React.createClass({
             node = messages[i];
             // break at the first message (coming from the bottom)
             // that has it's offsetTop above the bottom of the viewport.
-            if (node.offsetTop < viewportBottom) {
+            if (this._topFromBottom(node) > viewportBottom) {
                 // Use this node as the scrollToken
                 break;
             }