diff --git a/src/controllers/organisms/RoomView.js b/src/controllers/organisms/RoomView.js
index c6a0735bc8..7c3a3d0ad9 100644
--- a/src/controllers/organisms/RoomView.js
+++ b/src/controllers/organisms/RoomView.js
@@ -114,7 +114,10 @@ module.exports = {
 
         if (this.refs.messageWrapper) {
             var messageWrapper = this.refs.messageWrapper.getDOMNode();
-            this.atBottom = messageWrapper.scrollHeight - messageWrapper.scrollTop <= messageWrapper.clientHeight;
+            this.atBottom = (
+                messageWrapper.scrollHeight - messageWrapper.scrollTop <= 
+                (messageWrapper.clientHeight + 150)
+            );
         }
         this.setState({
             room: MatrixClientPeg.get().getRoom(this.props.roomId)