diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index a9b34c9058..6e05138e2d 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -318,6 +318,9 @@ export default React.createClass({
         // N.B. we don't call the whole of setTheme() here as we may be
         // racing with the theme CSS download finishing from index.js
         Tinter.tint();
+
+        // For PersistentElement
+        this.state.resizeNotifier.on("middlePanelResized", this._dispatchTimelineResize);
     },
 
     componentDidMount: function() {
@@ -400,6 +403,7 @@ export default React.createClass({
         dis.unregister(this.dispatcherRef);
         window.removeEventListener("focus", this.onFocus);
         window.removeEventListener('resize', this.handleResize);
+        this.state.resizeNotifier.removeListener("middlePanelResized", this._dispatchTimelineResize);
     },
 
     componentWillUpdate: function(props, state) {
@@ -1667,6 +1671,10 @@ export default React.createClass({
         this._windowWidth = window.innerWidth;
     },
 
+    _dispatchTimelineResize() {
+        dis.dispatch({ action: 'timeline_resize' }, true);
+    },
+
     onRoomCreated: function(roomId) {
         dis.dispatch({
             action: "view_room",
diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js
index aec2f8cbe1..fecf5f1ad7 100644
--- a/src/components/structures/MessagePanel.js
+++ b/src/components/structures/MessagePanel.js
@@ -21,7 +21,6 @@ import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import shouldHideEvent from '../../shouldHideEvent';
 import {wantsDateSeparator} from '../../DateUtils';
-import dis from "../../dispatcher";
 import sdk from '../../index';
 
 import MatrixClientPeg from '../../MatrixClientPeg';
@@ -665,10 +664,6 @@ module.exports = React.createClass({
         }
     },
 
-    onResize: function() {
-        dis.dispatch({ action: 'timeline_resize' }, true);
-    },
-
     render: function() {
         const ScrollPanel = sdk.getComponent("structures.ScrollPanel");
         const WhoIsTypingTile = sdk.getComponent("rooms.WhoIsTypingTile");
diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 5a914cbd1c..507fbf6979 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -856,10 +856,6 @@ module.exports = React.createClass({
         }
     },
 
-    onSearchResultsResize: function() {
-        dis.dispatch({ action: 'timeline_resize' }, true);
-    },
-
     onSearchResultsFillRequest: function(backwards) {
         if (!backwards) {
             return Promise.resolve(false);
@@ -1794,7 +1790,6 @@ module.exports = React.createClass({
                     <ScrollPanel ref="searchResultsPanel"
                         className="mx_RoomView_messagePanel mx_RoomView_searchResultsPanel"
                         onFillRequest={this.onSearchResultsFillRequest}
-                        onResize={this.onSearchResultsResize}
                     >
                         <li className={scrollheader_classes}></li>
                         { this.getSearchResultTiles() }