diff --git a/src/components/structures/ScrollPanel.js b/src/components/structures/ScrollPanel.js
index fc0b630f26..80d35aea65 100644
--- a/src/components/structures/ScrollPanel.js
+++ b/src/components/structures/ScrollPanel.js
@@ -150,6 +150,9 @@ module.exports = React.createClass({
             // more messages.
             this._maybeFill(true);
         }
+        if (sn.scrollTop > sn.scrollHeight - sn.clientHeight * 2) {
+            this._maybeFill(false);
+        }
     },
 
     // check if there is already a pending fill request. If not, set one off.