diff --git a/app/assets/javascripts/discourse/views/activity-filter.js.es6 b/app/assets/javascripts/discourse/views/activity-filter.js.es6
index 52505710bee..8fe07f7e6b2 100644
--- a/app/assets/javascripts/discourse/views/activity-filter.js.es6
+++ b/app/assets/javascripts/discourse/views/activity-filter.js.es6
@@ -7,12 +7,17 @@ export default Ember.Component.extend(StringBuffer, {
   rerenderTriggers: ['content.count', 'count'],
   noGlyph: Em.computed.empty('icon'),
 
+  isIndexStream: function() {
+    return !this.get('content');
+  }.property('content.count'),
+
   active: function() {
+    if (this.get('isIndexStream')) {
+      return !this.get('userActionType');
+    }
     var content = this.get('content');
     if (content) {
       return parseInt(this.get('userActionType'), 10) === parseInt(Em.get(content, 'action_type'), 10);
-    } else {
-      return this.get('indexStream');
     }
   }.property('userActionType', 'indexStream'),