diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 3f79e1afe0..d7d3d5988c 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -642,10 +642,17 @@ module.exports = React.createClass({
             var lastRoomId;
 
             if (this.state.searchCanPaginate === false) {
-                ret.push(<li key="search-top-marker">
-                         <h2 className="mx_RoomView_topMarker">End of search results</h2>
-                         </li>
-                        );
+                if (this.state.searchResults.length == 0) {
+                    ret.push(<li key="search-top-marker">
+                             <h2 className="mx_RoomView_topMarker">No results</h2>
+                             </li>
+                            );
+                } else {
+                    ret.push(<li key="search-top-marker">
+                             <h2 className="mx_RoomView_topMarker">No more results</h2>
+                             </li>
+                            );
+                }
             }
 
             for (var i = this.state.searchResults.length - 1; i >= 0; i--) {