diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js
index 4aa9ff00..de883932 100644
--- a/src/components/structures/RoomSubList.js
+++ b/src/components/structures/RoomSubList.js
@@ -248,10 +248,9 @@ var RoomSubList = React.createClass({
 
                 if (badges) {
                     result[0] += notificationCount;
-                    if (highlight) {
-                        result[1] = true;
-                    }
                 }
+
+                result[1] |= highlight;
             }
             return result;
         }, [0, false]);
@@ -403,6 +402,9 @@ var RoomSubList = React.createClass({
         if (subListNotifCount > 0) {
             badge = <div className={badgeClasses}>{ FormattingUtils.formatCount(subListNotifCount) }</div>;
         }
+        else if (subListNotifHighlight) {
+            badge = <div className={badgeClasses}>{ ! }</div>;   
+        }
 
         // When collapsed, allow a long hover on the header to show user
         // the full tag name and room count