diff --git a/src/components/structures/ScrollPanel.js b/src/components/structures/ScrollPanel.js
index 3575d69b3f..63725b8b86 100644
--- a/src/components/structures/ScrollPanel.js
+++ b/src/components/structures/ScrollPanel.js
@@ -599,8 +599,7 @@ module.exports = React.createClass({
             // as the scrollToken.
             // If this is false for the entire for-loop, we default to the last node
             // (which is why newScrollState is set on every iteration).
-            if (boundingRect.top < wrapperRect.bottom &&
-                wrapperRect.bottom < boundingRect.bottom) {
+            if (boundingRect.top < wrapperRect.bottom) {
                 // Use this node as the scrollToken
                 break;
             }