diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js
index c5507e76ba..50db2b4122 100644
--- a/src/components/structures/RoomSubList.js
+++ b/src/components/structures/RoomSubList.js
@@ -137,6 +137,13 @@ var RoomSubList = React.createClass({
             this.setState({ capTruncate : true });
             // Truncated list
             this.setState({ truncateAt : TRUNCATE_AT });
+        } else {
+            // Catch any weird states the system gets into
+            isHidden = false;
+            this.setState({ hidden : isHidden });
+            this.setState({ capTruncate : true });
+            // Show truncated list
+            this.setState({ truncateAt : TRUNCATE_AT });
         }
 
         this.props.onShowMoreRooms();