diff --git a/package.json b/package.json
index 3a55730402..32055a1f5c 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,7 @@
     "q": "^1.4.1",
     "react": "^0.14.2",
     "react-dom": "^0.14.2",
-    "react-gemini-scrollbar": "matrix-org/react-gemini-scrollbar#d9a808d",
+    "react-gemini-scrollbar": "matrix-org/react-gemini-scrollbar#3ee2648",
     "sanitize-html": "^1.11.1",
     "velocity-animate": "^1.2.3",
     "velocity-ui-pack": "^1.2.2"
diff --git a/src/components/structures/ScrollPanel.js b/src/components/structures/ScrollPanel.js
index a7f66d14cc..9b85854016 100644
--- a/src/components/structures/ScrollPanel.js
+++ b/src/components/structures/ScrollPanel.js
@@ -470,7 +470,8 @@ module.exports = React.createClass({
         // TODO: the classnames on the div and ol could do with being updated to
         // reflect the fact that we don't necessarily contain a list of messages.
         // it's not obvious why we have a separate div and ol anyway.
-        return (<GeminiScrollbar autoshow={true} ref="geminiPanel" onScroll={ this.onScroll }
+        return (<GeminiScrollbar autoshow={true} ref="geminiPanel"
+                onScroll={this.onScroll} onResize={this.checkScroll}
                 className={this.props.className} style={this.props.style}>
                     <div className="mx_RoomView_messageListWrapper">
                         <ol ref="itemlist" className="mx_RoomView_MessageList" aria-live="polite">