diff --git a/graylog2-server/src/main/java/org/graylog/plugins/views/migrations/V20191125144500_MigrateDashboardsToViewsSupport/AggregationWidget.java b/graylog2-server/src/main/java/org/graylog/plugins/views/migrations/V20191125144500_MigrateDashboardsToViewsSupport/AggregationWidget.java
index 86388e84e09b..9cdfb7cf023c 100644
--- a/graylog2-server/src/main/java/org/graylog/plugins/views/migrations/V20191125144500_MigrateDashboardsToViewsSupport/AggregationWidget.java
+++ b/graylog2-server/src/main/java/org/graylog/plugins/views/migrations/V20191125144500_MigrateDashboardsToViewsSupport/AggregationWidget.java
@@ -40,6 +40,7 @@ public abstract class AggregationWidget implements ViewWidget {
     private static final String FIELD_TIMERANGE = "timerange";
     private static final String FIELD_QUERY = "query";
     private static final String FIELD_STREAMS = "streams";
+    private static final String FIELD_STREAM_CATEGORIES = "stream_categories";
 
     @JsonProperty(FIELD_ID)
     public abstract String id();
@@ -60,13 +61,17 @@ public abstract class AggregationWidget implements ViewWidget {
     @JsonProperty(FIELD_STREAMS)
     abstract Set<String> streams();
 
+    @JsonProperty(FIELD_STREAM_CATEGORIES)
+    abstract Set<String> streamCategories();
+
     @JsonProperty(FIELD_CONFIG)
     public abstract AggregationConfig config();
 
     public static Builder builder() {
         return new AutoValue_AggregationWidget.Builder()
                 .type(TYPE_AGGREGATION)
-                .streams(Collections.emptySet());
+                .streams(Collections.emptySet())
+                .streamCategories(Collections.emptySet());
     }
 
     public Set<SearchType> toSearchTypes(RandomUUIDProvider randomUUIDProvider) {
@@ -75,6 +80,7 @@ public Set<SearchType> toSearchTypes(RandomUUIDProvider randomUUIDProvider) {
                 .name("chart")
                 .query(query())
                 .streams(streams())
+                .streamCategories(streamCategories())
                 .timerange(timerange())
                 .rollup(config().rollup())
                 .rowGroups(config().rowPivots().stream().map(pivot -> pivot.toBucketSpec()).collect(Collectors.toList()))
@@ -122,6 +128,9 @@ public Builder query(String query) {
         @JsonProperty(FIELD_STREAMS)
         public abstract Builder streams(Set<String> streams);
 
+        @JsonProperty(FIELD_STREAM_CATEGORIES)
+        public abstract Builder streamCategories(Set<String> streamCategories);
+
         @JsonProperty(FIELD_CONFIG)
         public abstract Builder config(AggregationConfig config);
 
diff --git a/graylog2-server/src/main/java/org/graylog/plugins/views/migrations/V20191125144500_MigrateDashboardsToViewsSupport/MessageList.java b/graylog2-server/src/main/java/org/graylog/plugins/views/migrations/V20191125144500_MigrateDashboardsToViewsSupport/MessageList.java
index a0998564283b..0ccd956647dd 100644
--- a/graylog2-server/src/main/java/org/graylog/plugins/views/migrations/V20191125144500_MigrateDashboardsToViewsSupport/MessageList.java
+++ b/graylog2-server/src/main/java/org/graylog/plugins/views/migrations/V20191125144500_MigrateDashboardsToViewsSupport/MessageList.java
@@ -73,6 +73,8 @@ Builder query(String query) {
 
         abstract Builder streams(Set<String> streams);
 
+        abstract Builder streamCategories(Set<String> streamCategories);
+
         abstract Builder limit(int limit);
 
         abstract Builder offset(int offset);
diff --git a/graylog2-server/src/main/java/org/graylog/plugins/views/migrations/V20191125144500_MigrateDashboardsToViewsSupport/Pivot.java b/graylog2-server/src/main/java/org/graylog/plugins/views/migrations/V20191125144500_MigrateDashboardsToViewsSupport/Pivot.java
index 628186187b1f..77ed96c57742 100644
--- a/graylog2-server/src/main/java/org/graylog/plugins/views/migrations/V20191125144500_MigrateDashboardsToViewsSupport/Pivot.java
+++ b/graylog2-server/src/main/java/org/graylog/plugins/views/migrations/V20191125144500_MigrateDashboardsToViewsSupport/Pivot.java
@@ -92,6 +92,8 @@ Builder query(String query) {
 
         abstract Builder streams(Set<String> streams);
 
+        abstract Builder streamCategories(Set<String> streamCategories);
+
         abstract Pivot build();
     }
 }
diff --git a/graylog2-server/src/main/java/org/graylog/plugins/views/migrations/V20191125144500_MigrateDashboardsToViewsSupport/SearchType.java b/graylog2-server/src/main/java/org/graylog/plugins/views/migrations/V20191125144500_MigrateDashboardsToViewsSupport/SearchType.java
index ec89f8821776..5f174201a90f 100644
--- a/graylog2-server/src/main/java/org/graylog/plugins/views/migrations/V20191125144500_MigrateDashboardsToViewsSupport/SearchType.java
+++ b/graylog2-server/src/main/java/org/graylog/plugins/views/migrations/V20191125144500_MigrateDashboardsToViewsSupport/SearchType.java
@@ -34,6 +34,9 @@ public interface SearchType {
     @JsonProperty
     Set<String> streams();
 
+    @JsonProperty
+    Set<String> streamCategories();
+
     @JsonProperty
     Optional<String> name();
 }
diff --git a/graylog2-server/src/main/java/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/search/MessagesSearchType.java b/graylog2-server/src/main/java/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/search/MessagesSearchType.java
index ccc4049d77e7..1a62c09b89d2 100644
--- a/graylog2-server/src/main/java/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/search/MessagesSearchType.java
+++ b/graylog2-server/src/main/java/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/search/MessagesSearchType.java
@@ -22,6 +22,7 @@
 import org.graylog.plugins.views.migrations.V20191203120602_MigrateSavedSearchesToViewsSupport.view.ElasticsearchQueryString;
 import org.graylog.plugins.views.migrations.V20191203120602_MigrateSavedSearchesToViewsSupport.view.TimeRange;
 
+import javax.annotation.Nullable;
 import java.util.Collections;
 import java.util.Optional;
 import java.util.Set;
@@ -35,6 +36,7 @@ public abstract class MessagesSearchType implements SearchType {
     private static final String FIELD_TIMERANGE = "timerange";
     private static final String FIELD_QUERY = "query";
     private static final String FIELD_STREAMS = "streams";
+    private static final String FIELD_STREAM_CATEGORIES = "stream_categories";
     private static final String FIELD_NAME = "name";
     private static final String FIELD_LIMIT = "limit";
     private static final String FIELD_OFFSET = "offset";
@@ -62,6 +64,12 @@ public Set<String> streams() {
         return Collections.emptySet();
     }
 
+    @Nullable
+    @JsonProperty(FIELD_STREAM_CATEGORIES)
+    public Set<String> streamCategories() {
+        return Collections.emptySet();
+    }
+
     @JsonProperty(FIELD_NAME)
     public Optional<String> name() {
         return Optional.empty();
diff --git a/graylog2-server/src/main/java/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/search/Pivot.java b/graylog2-server/src/main/java/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/search/Pivot.java
index b41e6e888ef8..d5f140ab4cd8 100644
--- a/graylog2-server/src/main/java/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/search/Pivot.java
+++ b/graylog2-server/src/main/java/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/search/Pivot.java
@@ -56,6 +56,11 @@ public Set<String> streams() {
         return Collections.emptySet();
     }
 
+    @Override
+    public Set<String> streamCategories() {
+        return Collections.emptySet();
+    }
+
     @JsonProperty("row_groups")
     abstract List<Time> rowGroups();
 
diff --git a/graylog2-server/src/main/java/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/search/SearchType.java b/graylog2-server/src/main/java/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/search/SearchType.java
index 4f85d341bfb7..aacf9f245db9 100644
--- a/graylog2-server/src/main/java/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/search/SearchType.java
+++ b/graylog2-server/src/main/java/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/search/SearchType.java
@@ -35,4 +35,7 @@ public interface SearchType {
 
     @JsonProperty
     Set<String> streams();
+
+    @JsonProperty
+    Set<String> streamCategories();
 }
diff --git a/graylog2-server/src/main/java/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/view/AggregationWidget.java b/graylog2-server/src/main/java/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/view/AggregationWidget.java
index 8bc31eeef559..4d1f537f64cf 100644
--- a/graylog2-server/src/main/java/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/view/AggregationWidget.java
+++ b/graylog2-server/src/main/java/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/view/AggregationWidget.java
@@ -42,6 +42,7 @@ public abstract class AggregationWidget implements ViewWidget {
     private static final String FIELD_TIMERANGE = "timerange";
     private static final String FIELD_QUERY = "query";
     private static final String FIELD_STREAMS = "streams";
+    private static final String FIELD_STREAM_CATEGORIES = "stream_categories";
 
     @JsonProperty(FIELD_ID)
     public abstract String id();
@@ -74,6 +75,11 @@ Set<String> streams() {
         return Collections.emptySet();
     }
 
+    @JsonProperty(FIELD_STREAM_CATEGORIES)
+    Set<String> streamCategories() {
+        return Collections.emptySet();
+    }
+
     @JsonProperty(FIELD_CONFIG)
     public abstract AggregationConfig config();
 
diff --git a/graylog2-server/src/main/java/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/view/MessagesWidget.java b/graylog2-server/src/main/java/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/view/MessagesWidget.java
index 10e61326fbe2..895d90ea7f60 100644
--- a/graylog2-server/src/main/java/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/view/MessagesWidget.java
+++ b/graylog2-server/src/main/java/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/view/MessagesWidget.java
@@ -36,6 +36,7 @@ public abstract class MessagesWidget implements ViewWidget {
     private static final String FIELD_TIMERANGE = "timerange";
     private static final String FIELD_QUERY = "query";
     private static final String FIELD_STREAMS = "streams";
+    private static final String FIELD_STREAM_CATEGORIES = "stream_categories";
     private static final String FIELD_CONFIG = "config";
 
     @JsonProperty(FIELD_ID)
@@ -63,6 +64,11 @@ Set<String> streams() {
         return Collections.emptySet();
     }
 
+    @JsonProperty(FIELD_STREAM_CATEGORIES)
+    Set<String> streamCategories() {
+        return Collections.emptySet();
+    }
+
     @JsonProperty(FIELD_CONFIG)
     abstract MessagesWidgetConfig config();
 
diff --git a/graylog2-server/src/main/java/org/graylog/plugins/views/search/Search.java b/graylog2-server/src/main/java/org/graylog/plugins/views/search/Search.java
index 4eca94312a6a..6f83b5615117 100644
--- a/graylog2-server/src/main/java/org/graylog/plugins/views/search/Search.java
+++ b/graylog2-server/src/main/java/org/graylog/plugins/views/search/Search.java
@@ -172,6 +172,39 @@ public Search addStreamsToQueriesWithCategories(Function<Collection<String>, Str
         return toBuilder().queries(newQueries).build();
     }
 
+    public Search addStreamsToSearchTypesWithCategories(Function<Collection<String>, Stream<String>> categoryMappingFunction,
+                                                        StreamPermissions streamPermissions) {
+        if (!hasQuerySearchTypesWithStreamCategories()) {
+            return this;
+        }
+        final Set<Query> withStreamCategories = queries().stream()
+                .filter(q -> q.searchTypes().stream()
+                        .anyMatch(SearchType::hasStreamCategories))
+                .collect(toSet());
+        final Set<Query> withoutStreamCategories = Sets.difference(queries(), withStreamCategories);
+        final Set<Query> withMappedStreamCategories = new HashSet<>();
+
+        for (Query query : withStreamCategories) {
+            final Set<SearchType> mappedSearchTypes = new HashSet<>();
+            for (SearchType st : query.searchTypes()) {
+                if (!st.hasStreamCategories()) {
+                    mappedSearchTypes.add(st);
+                } else {
+                    final Set<String> mappedStreamIds = categoryMappingFunction.apply(st.streamCategories())
+                            .filter(streamPermissions::canReadStream)
+                            .collect(toSet());
+                    mappedStreamIds.addAll(st.streams());
+                    mappedSearchTypes.add(st.toBuilder().streams(mappedStreamIds).build());
+                }
+            }
+            withMappedStreamCategories.add(query.toBuilder().searchTypes(mappedSearchTypes).build());
+        }
+
+        final ImmutableSet<Query> newQueries = Sets.union(withMappedStreamCategories, withoutStreamCategories).immutableCopy();
+
+        return toBuilder().queries(newQueries).build();
+    }
+
     private boolean hasQueriesWithoutStreams() {
         return !queries().stream().allMatch(Query::hasStreams);
     }
@@ -180,6 +213,12 @@ private boolean hasQueriesWithStreamCategories() {
         return queries().stream().anyMatch(q -> !q.usedStreamCategories().isEmpty());
     }
 
+    private boolean hasQuerySearchTypesWithStreamCategories() {
+        return queries().stream()
+                .flatMap(q -> q.searchTypes().stream())
+                .anyMatch(SearchType::hasStreamCategories);
+    }
+
     public abstract Builder toBuilder();
 
     public static Builder builder() {
diff --git a/graylog2-server/src/main/java/org/graylog/plugins/views/search/SearchType.java b/graylog2-server/src/main/java/org/graylog/plugins/views/search/SearchType.java
index d451948a06a3..5a6e815460ef 100644
--- a/graylog2-server/src/main/java/org/graylog/plugins/views/search/SearchType.java
+++ b/graylog2-server/src/main/java/org/graylog/plugins/views/search/SearchType.java
@@ -85,6 +85,10 @@ public interface SearchType extends ContentPackable<SearchTypeEntity>, Exportabl
     @JsonProperty
     Set<String> streams();
 
+    @Nullable
+    @JsonProperty
+    Set<String> streamCategories();
+
     SearchType applyExecutionContext(SearchTypeExecutionState executionState);
 
     default SearchType withQuery(BackendQuery query) {
@@ -110,6 +114,10 @@ default SearchType withReferenceDate(DateTime now) {
                 .orElse(this);
     }
 
+    default boolean hasStreamCategories() {
+        return streamCategories() != null && !streamCategories().isEmpty();
+    }
+
     SearchTypeBuilder toBuilder();
 
     /**
@@ -164,6 +172,10 @@ class Fallback implements SearchType {
         @JsonProperty
         private Set<String> streams;
 
+        @Nullable
+        @JsonProperty
+        private Set<String> streamCategories;
+
         @Override
         public String type() {
             return type;
@@ -204,6 +216,11 @@ public Set<String> streams() {
             return this.streams == null ? Collections.emptySet() : this.streams;
         }
 
+        @Override
+        public Set<String> streamCategories() {
+            return this.streamCategories == null ? Collections.emptySet() : this.streamCategories;
+        }
+
         @Override
         public SearchType applyExecutionContext(SearchTypeExecutionState state) {
             return this;
@@ -284,6 +301,11 @@ public SearchTypeBuilder query(@Nullable BackendQuery query) {
                 public SearchTypeBuilder filter(@Nullable Filter filter) {
                     return this;
                 }
+
+                @Override
+                public SearchTypeBuilder streams(Set<String> streams) {
+                    return this;
+                }
             };
         }
     }
diff --git a/graylog2-server/src/main/java/org/graylog/plugins/views/search/SearchTypeBuilder.java b/graylog2-server/src/main/java/org/graylog/plugins/views/search/SearchTypeBuilder.java
index 4e171ea676c7..0beb7e3f8c2d 100644
--- a/graylog2-server/src/main/java/org/graylog/plugins/views/search/SearchTypeBuilder.java
+++ b/graylog2-server/src/main/java/org/graylog/plugins/views/search/SearchTypeBuilder.java
@@ -22,6 +22,7 @@
 
 import javax.annotation.Nullable;
 import java.util.List;
+import java.util.Set;
 
 public interface SearchTypeBuilder {
     SearchType build();
@@ -33,4 +34,6 @@ public interface SearchTypeBuilder {
     SearchTypeBuilder query(@Nullable BackendQuery query);
 
     SearchTypeBuilder filter(@Nullable Filter filter);
+
+    SearchTypeBuilder streams(Set<String> streams);
 }
diff --git a/graylog2-server/src/main/java/org/graylog/plugins/views/search/engine/normalization/PluggableSearchNormalization.java b/graylog2-server/src/main/java/org/graylog/plugins/views/search/engine/normalization/PluggableSearchNormalization.java
index d0d782acdd48..92fc62f674dd 100644
--- a/graylog2-server/src/main/java/org/graylog/plugins/views/search/engine/normalization/PluggableSearchNormalization.java
+++ b/graylog2-server/src/main/java/org/graylog/plugins/views/search/engine/normalization/PluggableSearchNormalization.java
@@ -76,8 +76,9 @@ private Query normalize(final Query query,
     @Override
     public Search preValidation(Search search, SearchUser searchUser, ExecutionState executionState) {
         final Search searchWithStreams = search
-                .addStreamsToQueriesWithoutStreams(() -> searchUser.streams().loadMessageStreamsWithFallback())
-                .addStreamsToQueriesWithCategories(streamCategoryMapper, searchUser);
+                .addStreamsToQueriesWithCategories(streamCategoryMapper, searchUser)
+                .addStreamsToSearchTypesWithCategories(streamCategoryMapper, searchUser)
+                .addStreamsToQueriesWithoutStreams(() -> searchUser.streams().loadMessageStreamsWithFallback());
         final var now = referenceDateFromOverrideOrNow(executionState);
         final var normalizedSearch = searchWithStreams.applyExecutionState(firstNonNull(executionState, ExecutionState.empty()))
                 .withReferenceDate(now);
diff --git a/graylog2-server/src/main/java/org/graylog/plugins/views/search/permissions/UserStreams.java b/graylog2-server/src/main/java/org/graylog/plugins/views/search/permissions/UserStreams.java
index 633c9be7d631..7598bec9e8ac 100644
--- a/graylog2-server/src/main/java/org/graylog/plugins/views/search/permissions/UserStreams.java
+++ b/graylog2-server/src/main/java/org/graylog/plugins/views/search/permissions/UserStreams.java
@@ -58,6 +58,10 @@ public ImmutableSet<String> loadMessageStreamsWithFallback() {
         }
     }
 
+    public ImmutableSet<String> loadStreamsWithCategories(Set<String> categories) {
+        return permittedStreams.loadWithCategories(categories, streamPermissions);
+    }
+
     /**
      * If any stream IDs are provided, they will be filtered out by read permission. If none are given, we'll load
      * all available streams for the current SearchUser
diff --git a/graylog2-server/src/main/java/org/graylog/plugins/views/search/rest/QueryValidationResource.java b/graylog2-server/src/main/java/org/graylog/plugins/views/search/rest/QueryValidationResource.java
index ae2ff24c0d0a..e1d917abd7e9 100644
--- a/graylog2-server/src/main/java/org/graylog/plugins/views/search/rest/QueryValidationResource.java
+++ b/graylog2-server/src/main/java/org/graylog/plugins/views/search/rest/QueryValidationResource.java
@@ -43,6 +43,7 @@
 import org.graylog2.shared.rest.resources.RestResource;
 
 import java.util.Comparator;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -90,10 +91,19 @@ private boolean containsWarmIndices(Set<ExplainResults.IndexRangeResult> searche
     }
 
     private ValidationRequest prepareRequest(ValidationRequestDTO validationRequest, SearchUser searchUser) {
+        // Combine stream IDs mapped from streamCategories and stream IDs from the validationRequest before calling
+        // readableOrAllIfEmpty to ensure all possible requested streams are added first.
+        final Set<String> streamsAndMappedCategories = validationRequest.streams().orElse(new HashSet<>());
+        if (validationRequest.streamCategories().isPresent()) {
+            streamsAndMappedCategories.addAll(searchUser.streams().loadStreamsWithCategories(validationRequest.streamCategories().get()));
+        }
+        ImmutableSet.Builder<String> allRequestedStreams = ImmutableSet.<String>builder()
+                .addAll(searchUser.streams().readableOrAllIfEmpty(streamsAndMappedCategories));
+
         final ValidationRequest.Builder q = ValidationRequest.Builder.builder()
                 .query(validationRequest.query())
                 .timerange(validationRequest.timerange().orElse(defaultTimeRange()))
-                .streams(searchUser.streams().readableOrAllIfEmpty(validationRequest.streams()))
+                .streams(allRequestedStreams.build())
                 .parameters(resolveParameters(validationRequest))
                 .validationMode(validationRequest.validationMode().toInternalRepresentation());
 
diff --git a/graylog2-server/src/main/java/org/graylog/plugins/views/search/rest/ValidationRequestDTO.java b/graylog2-server/src/main/java/org/graylog/plugins/views/search/rest/ValidationRequestDTO.java
index c4bfb24db186..54e250be74ec 100644
--- a/graylog2-server/src/main/java/org/graylog/plugins/views/search/rest/ValidationRequestDTO.java
+++ b/graylog2-server/src/main/java/org/graylog/plugins/views/search/rest/ValidationRequestDTO.java
@@ -38,6 +38,7 @@
 public abstract class ValidationRequestDTO {
 
     private static final String FIELD_STREAMS = "streams";
+    private static final String FIELD_STREAM_CATEGORIES = "stream_categories";
     private static final String FIELD_TIMERANGE = "timerange";
 
     @JsonProperty
@@ -58,6 +59,9 @@ public abstract class ValidationRequestDTO {
     @JsonProperty(FIELD_STREAMS)
     public abstract Optional<Set<String>> streams();
 
+    @JsonProperty(FIELD_STREAM_CATEGORIES)
+    public abstract Optional<Set<String>> streamCategories();
+
     @JsonProperty
     public abstract ImmutableSet<Parameter> parameters();
 
@@ -79,6 +83,9 @@ public abstract static class Builder {
         @JsonProperty(FIELD_STREAMS)
         public abstract Builder streams(@Nullable Set<String> streams);
 
+        @JsonProperty(FIELD_STREAM_CATEGORIES)
+        public abstract Builder streamCategories(@Nullable Set<String> streamCategories);
+
         @JsonProperty(FIELD_TIMERANGE)
         public abstract Builder timerange(@Nullable TimeRange timerange);
 
diff --git a/graylog2-server/src/main/java/org/graylog/plugins/views/search/searchtypes/MessageList.java b/graylog2-server/src/main/java/org/graylog/plugins/views/search/searchtypes/MessageList.java
index 08e1b59f34f4..085fb7c08475 100644
--- a/graylog2-server/src/main/java/org/graylog/plugins/views/search/searchtypes/MessageList.java
+++ b/graylog2-server/src/main/java/org/graylog/plugins/views/search/searchtypes/MessageList.java
@@ -105,6 +105,7 @@ public static Builder builder() {
                 .offset(0)
                 .filters(Collections.emptyList())
                 .streams(Collections.emptySet())
+                .streamCategories(Collections.emptySet())
                 .decorators(Collections.emptyList())
                 .fields(Collections.emptyList());
     }
@@ -129,6 +130,7 @@ public abstract static class Builder implements SearchTypeBuilder {
         public static Builder createDefault() {
             return builder()
                     .filters(Collections.emptyList())
+                    .streamCategories(Collections.emptySet())
                     .streams(Collections.emptySet());
         }
 
@@ -164,6 +166,9 @@ public Builder timerange(@Nullable TimeRange timerange) {
         @JsonProperty
         public abstract Builder streams(Set<String> streams);
 
+        @JsonProperty
+        public abstract Builder streamCategories(Set<String> streamCategories);
+
         @JsonProperty
         public abstract Builder limit(int limit);
 
diff --git a/graylog2-server/src/main/java/org/graylog/plugins/views/search/searchtypes/events/EventList.java b/graylog2-server/src/main/java/org/graylog/plugins/views/search/searchtypes/events/EventList.java
index 70bdb19e183c..119c48c475b6 100644
--- a/graylog2-server/src/main/java/org/graylog/plugins/views/search/searchtypes/events/EventList.java
+++ b/graylog2-server/src/main/java/org/graylog/plugins/views/search/searchtypes/events/EventList.java
@@ -109,6 +109,7 @@ public static Builder builder() {
                 .type(NAME)
                 .filters(Collections.emptyList())
                 .streams(Collections.emptySet())
+                .streamCategories(Collections.emptySet())
                 .attributes(Collections.emptyList());
     }
 
@@ -144,6 +145,7 @@ public abstract static class Builder implements SearchTypeBuilder {
         public static Builder createDefault() {
             return builder()
                     .filters(Collections.emptyList())
+                    .streamCategories(Collections.emptySet())
                     .streams(Collections.emptySet());
         }
 
@@ -173,6 +175,9 @@ public static Builder createDefault() {
         @JsonProperty
         public abstract Builder streams(Set<String> streams);
 
+        @JsonProperty
+        public abstract Builder streamCategories(@Nullable Set<String> streamCategories);
+
         @JsonProperty
         public abstract Builder page(@Nullable Integer page);
 
diff --git a/graylog2-server/src/main/java/org/graylog/plugins/views/search/searchtypes/pivot/Pivot.java b/graylog2-server/src/main/java/org/graylog/plugins/views/search/searchtypes/pivot/Pivot.java
index becd6d739080..871689e8cdcc 100644
--- a/graylog2-server/src/main/java/org/graylog/plugins/views/search/searchtypes/pivot/Pivot.java
+++ b/graylog2-server/src/main/java/org/graylog/plugins/views/search/searchtypes/pivot/Pivot.java
@@ -99,6 +99,7 @@ public static Builder builder() {
                 .columnGroups(of())
                 .sort(of())
                 .filters(of())
+                .streamCategories(Collections.emptySet())
                 .streams(Collections.emptySet());
     }
 
@@ -109,6 +110,7 @@ public static Builder createDefault() {
             return builder()
                     .sort(Collections.emptyList())
                     .filters(Collections.emptyList())
+                    .streamCategories(Collections.emptySet())
                     .streams(Collections.emptySet());
         }
 
@@ -172,6 +174,9 @@ public Builder timerange(@Nullable TimeRange timerange) {
         @JsonProperty
         public abstract Builder streams(Set<String> streams);
 
+        @JsonProperty
+        public abstract Builder streamCategories(@Nullable Set<String> streamCategories);
+
         abstract Pivot autoBuild();
 
         public Pivot build() {
diff --git a/graylog2-server/src/main/java/org/graylog/plugins/views/search/views/WidgetDTO.java b/graylog2-server/src/main/java/org/graylog/plugins/views/search/views/WidgetDTO.java
index 8ab571b3d1c2..609ae788d111 100644
--- a/graylog2-server/src/main/java/org/graylog/plugins/views/search/views/WidgetDTO.java
+++ b/graylog2-server/src/main/java/org/graylog/plugins/views/search/views/WidgetDTO.java
@@ -55,6 +55,7 @@ public abstract class WidgetDTO implements ContentPackable<WidgetEntity>, UsesSe
     public static final String FIELD_TIMERANGE = "timerange";
     public static final String FIELD_QUERY = "query";
     public static final String FIELD_STREAMS = "streams";
+    public static final String FIELD_STREAM_CATEGORIES = "stream_categories";
 
     @JsonProperty(FIELD_ID)
     public abstract String id();
@@ -79,6 +80,10 @@ public abstract class WidgetDTO implements ContentPackable<WidgetEntity>, UsesSe
     @JsonProperty(FIELD_STREAMS)
     public abstract Set<String> streams();
 
+    @JsonProperty(FIELD_STREAM_CATEGORIES)
+    @Nullable
+    public abstract Set<String> streamCategories();
+
     @JsonProperty(FIELD_CONFIG)
     public abstract WidgetConfigDTO config();
 
@@ -111,6 +116,9 @@ public static abstract class Builder {
         @JsonProperty(FIELD_STREAMS)
         public abstract Builder streams(Set<String> streams);
 
+        @JsonProperty(FIELD_STREAM_CATEGORIES)
+        public abstract Builder streamCategories(@Nullable Set<String> streamCategories);
+
         @JsonProperty(FIELD_CONFIG)
         @JsonTypeInfo(
                 use = JsonTypeInfo.Id.NAME,
@@ -126,7 +134,8 @@ public static abstract class Builder {
         static Builder builder() {
             return new AutoValue_WidgetDTO.Builder()
                     .streams(Collections.emptySet())
-                    .filters(Collections.emptyList());
+                    .filters(Collections.emptyList())
+                    .streamCategories(Collections.emptySet());
         }
     }
 
diff --git a/graylog2-server/src/main/java/org/graylog2/rest/resources/streams/StreamResource.java b/graylog2-server/src/main/java/org/graylog2/rest/resources/streams/StreamResource.java
index 9c233f78636c..18c8d8eab66f 100644
--- a/graylog2-server/src/main/java/org/graylog2/rest/resources/streams/StreamResource.java
+++ b/graylog2-server/src/main/java/org/graylog2/rest/resources/streams/StreamResource.java
@@ -680,7 +680,8 @@ private StreamResponse streamToResponse(Stream stream) {
                 stream.getContentPack(),
                 stream.isDefaultStream(),
                 stream.getRemoveMatchesFromDefaultStream(),
-                stream.getIndexSetId()
+                stream.getIndexSetId(),
+                stream.getCategories()
         );
     }
 
diff --git a/graylog2-server/src/main/java/org/graylog2/rest/resources/streams/responses/StreamResponse.java b/graylog2-server/src/main/java/org/graylog2/rest/resources/streams/responses/StreamResponse.java
index ea20b1f08e56..bffa29665715 100644
--- a/graylog2-server/src/main/java/org/graylog2/rest/resources/streams/responses/StreamResponse.java
+++ b/graylog2-server/src/main/java/org/graylog2/rest/resources/streams/responses/StreamResponse.java
@@ -27,6 +27,7 @@
 
 import javax.annotation.Nullable;
 import java.util.Collection;
+import java.util.List;
 
 import static com.google.common.base.MoreObjects.firstNonNull;
 
@@ -79,6 +80,10 @@ public abstract class StreamResponse {
     @JsonProperty("is_editable")
     public abstract boolean isEditable();
 
+    @JsonProperty("categories")
+    @Nullable
+    public abstract List<String> categories();
+
     @JsonCreator
     public static StreamResponse create(@JsonProperty("id") String id,
                                         @JsonProperty("creator_user_id") String creatorUserId,
@@ -92,7 +97,8 @@ public static StreamResponse create(@JsonProperty("id") String id,
                                         @JsonProperty("content_pack") @Nullable String contentPack,
                                         @JsonProperty("is_default") @Nullable Boolean isDefault,
                                         @JsonProperty("remove_matches_from_default_stream") @Nullable Boolean removeMatchesFromDefaultStream,
-                                        @JsonProperty("index_set_id") String indexSetId) {
+                                        @JsonProperty("index_set_id") String indexSetId,
+                                        @JsonProperty("categories") @Nullable List<String> categories) {
         return new AutoValue_StreamResponse(
                 id,
                 creatorUserId,
@@ -107,6 +113,7 @@ public static StreamResponse create(@JsonProperty("id") String id,
                 firstNonNull(isDefault, false),
                 firstNonNull(removeMatchesFromDefaultStream, false),
                 indexSetId,
-                Stream.streamIsEditable(id));
+                Stream.streamIsEditable(id),
+                categories);
     }
 }
diff --git a/graylog2-server/src/test/java/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/V20191203120602_MigrateSavedSearchesToViewsTest.java b/graylog2-server/src/test/java/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/V20191203120602_MigrateSavedSearchesToViewsTest.java
index 4714bbf4374a..3e26e37e55a1 100644
--- a/graylog2-server/src/test/java/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/V20191203120602_MigrateSavedSearchesToViewsTest.java
+++ b/graylog2-server/src/test/java/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/V20191203120602_MigrateSavedSearchesToViewsTest.java
@@ -258,6 +258,7 @@ private void assertViewServiceCreatedViews(int count, String viewsCollection) th
         final List<View> newViews = newViewsCaptor.getAllValues();
         assertThat(newViews).hasSize(count);
 
+        String newViewsStr = toJSON(newViews);
         JSONAssert.assertEquals(viewsCollection, toJSON(newViews), true);
     }
 
@@ -270,6 +271,7 @@ private void assertSearchServiceCreated(int count, String searchCollection) thro
 
         assertThat(newSearches).hasSize(count);
 
+        String newSearchesStr = toJSON(newSearches);
         JSONAssert.assertEquals(toJSON(newSearches), searchCollection, true);
     }
 
diff --git a/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_absolute-expected_searches.json b/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_absolute-expected_searches.json
index 3dccc76fb365..7c3ae17a45fc 100644
--- a/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_absolute-expected_searches.json
+++ b/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_absolute-expected_searches.json
@@ -19,7 +19,8 @@
       "offset" : 0,
       "query" : null,
       "timerange" : null,
-      "streams" : [ ]
+      "streams" : [ ],
+      "stream_categories" : [ ]
     }, {
       "id" : "0000016e-b690-4271-0000-016eb690426f",
       "series" : [ {
@@ -35,6 +36,7 @@
       "timerange" : null,
       "rollup" : true,
       "streams" : [ ],
+      "stream_categories" : [ ],
       "row_groups" : [ {
         "field" : "timestamp",
         "interval" : {
diff --git a/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_absolute-expected_views.json b/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_absolute-expected_views.json
index e8f8c02543e3..ef0a9044effd 100644
--- a/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_absolute-expected_views.json
+++ b/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_absolute-expected_views.json
@@ -39,7 +39,8 @@
         "query" : null,
         "filter" : null,
         "timerange" : null,
-        "streams" : [ ]
+        "streams" : [ ],
+        "stream_categories" : [ ]
       }, {
         "id" : "0000016e-b690-4270-0000-016eb690426f",
         "config" : {
@@ -49,7 +50,8 @@
         "type" : "messages",
         "query" : null,
         "timerange" : null,
-        "streams" : [ ]
+        "streams" : [ ],
+        "stream_categories" : [ ]
       } ],
       "widget_mapping" : {
         "0000016e-b690-426f-0000-016eb690426f" : [ "0000016e-b690-4271-0000-016eb690426f" ],
diff --git a/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_absolute_with_interval_field-expected_searches.json b/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_absolute_with_interval_field-expected_searches.json
index 3dccc76fb365..7c3ae17a45fc 100644
--- a/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_absolute_with_interval_field-expected_searches.json
+++ b/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_absolute_with_interval_field-expected_searches.json
@@ -19,7 +19,8 @@
       "offset" : 0,
       "query" : null,
       "timerange" : null,
-      "streams" : [ ]
+      "streams" : [ ],
+      "stream_categories" : [ ]
     }, {
       "id" : "0000016e-b690-4271-0000-016eb690426f",
       "series" : [ {
@@ -35,6 +36,7 @@
       "timerange" : null,
       "rollup" : true,
       "streams" : [ ],
+      "stream_categories" : [ ],
       "row_groups" : [ {
         "field" : "timestamp",
         "interval" : {
diff --git a/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_absolute_with_interval_field-expected_views.json b/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_absolute_with_interval_field-expected_views.json
index e8f8c02543e3..ef0a9044effd 100644
--- a/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_absolute_with_interval_field-expected_views.json
+++ b/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_absolute_with_interval_field-expected_views.json
@@ -39,7 +39,8 @@
         "query" : null,
         "filter" : null,
         "timerange" : null,
-        "streams" : [ ]
+        "streams" : [ ],
+        "stream_categories" : [ ]
       }, {
         "id" : "0000016e-b690-4270-0000-016eb690426f",
         "config" : {
@@ -49,7 +50,8 @@
         "type" : "messages",
         "query" : null,
         "timerange" : null,
-        "streams" : [ ]
+        "streams" : [ ],
+        "stream_categories" : [ ]
       } ],
       "widget_mapping" : {
         "0000016e-b690-426f-0000-016eb690426f" : [ "0000016e-b690-4271-0000-016eb690426f" ],
diff --git a/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_keyword-expected_searches.json b/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_keyword-expected_searches.json
index 1033166c5530..8587c8ca2d83 100644
--- a/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_keyword-expected_searches.json
+++ b/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_keyword-expected_searches.json
@@ -18,6 +18,7 @@
       "offset" : 0,
       "query" : null,
       "streams" : [ ],
+      "stream_categories" : [ ],
       "timerange" : null
     }, {
       "id" : "0000016e-b690-4271-0000-016eb690426f",
@@ -32,6 +33,7 @@
       "sort" : [ ],
       "filter" : null,
       "streams" : [ ],
+      "stream_categories" : [ ],
       "timerange" : null,
       "rollup" : true,
       "row_groups" : [ {
diff --git a/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_keyword-expected_views.json b/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_keyword-expected_views.json
index 2eecd6fd1d6e..9d4d1b2faaed 100644
--- a/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_keyword-expected_views.json
+++ b/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_keyword-expected_views.json
@@ -39,6 +39,7 @@
         "query" : null,
         "filter" : null,
         "streams" : [ ],
+        "stream_categories" : [ ],
         "timerange" : null
       }, {
         "id" : "0000016e-b690-4270-0000-016eb690426f",
@@ -49,6 +50,7 @@
         "type" : "messages",
         "query" : null,
         "streams" : [ ],
+        "stream_categories" : [ ],
         "timerange" : null
       } ],
       "widget_mapping" : {
diff --git a/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_keyword_with_interval_field-expected_searches.json b/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_keyword_with_interval_field-expected_searches.json
index 1033166c5530..8587c8ca2d83 100644
--- a/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_keyword_with_interval_field-expected_searches.json
+++ b/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_keyword_with_interval_field-expected_searches.json
@@ -18,6 +18,7 @@
       "offset" : 0,
       "query" : null,
       "streams" : [ ],
+      "stream_categories" : [ ],
       "timerange" : null
     }, {
       "id" : "0000016e-b690-4271-0000-016eb690426f",
@@ -32,6 +33,7 @@
       "sort" : [ ],
       "filter" : null,
       "streams" : [ ],
+      "stream_categories" : [ ],
       "timerange" : null,
       "rollup" : true,
       "row_groups" : [ {
diff --git a/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_keyword_with_interval_field-expected_views.json b/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_keyword_with_interval_field-expected_views.json
index 2eecd6fd1d6e..9d4d1b2faaed 100644
--- a/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_keyword_with_interval_field-expected_views.json
+++ b/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_keyword_with_interval_field-expected_views.json
@@ -39,6 +39,7 @@
         "query" : null,
         "filter" : null,
         "streams" : [ ],
+        "stream_categories" : [ ],
         "timerange" : null
       }, {
         "id" : "0000016e-b690-4270-0000-016eb690426f",
@@ -49,6 +50,7 @@
         "type" : "messages",
         "query" : null,
         "streams" : [ ],
+        "stream_categories" : [ ],
         "timerange" : null
       } ],
       "widget_mapping" : {
diff --git a/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_relative-expected_searches.json b/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_relative-expected_searches.json
index facca64d502d..9e76fa15d6eb 100644
--- a/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_relative-expected_searches.json
+++ b/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_relative-expected_searches.json
@@ -19,7 +19,8 @@
         "offset" : 0,
         "query" : null,
         "timerange" : null,
-        "streams" : [ ]
+        "streams" : [ ],
+        "stream_categories" : [ ]
       }, {
         "id" : "0000016e-b690-4271-0000-016eb690426f",
         "series" : [ {
@@ -35,6 +36,7 @@
         "timerange" : null,
         "rollup" : true,
         "streams" : [ ],
+        "stream_categories" : [ ],
         "row_groups" : [ {
           "type": "time",
           "field" : "timestamp",
diff --git a/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_relative-expected_views.json b/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_relative-expected_views.json
index f1fc19ce1e49..f0441cbe4bbc 100644
--- a/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_relative-expected_views.json
+++ b/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_relative-expected_views.json
@@ -45,7 +45,8 @@
             "query": null,
             "filter": null,
             "timerange": null,
-            "streams": []
+            "streams": [],
+            "stream_categories": [ ]
           },
           {
             "id": "0000016e-b690-4270-0000-016eb690426f",
@@ -59,7 +60,8 @@
             "type": "messages",
             "query": null,
             "timerange": null,
-            "streams": []
+            "streams": [],
+            "stream_categories": [ ]
           }
         ],
         "widget_mapping": {
diff --git a/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_relative_with_interval_field-expected_searches.json b/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_relative_with_interval_field-expected_searches.json
index facca64d502d..9e76fa15d6eb 100644
--- a/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_relative_with_interval_field-expected_searches.json
+++ b/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_relative_with_interval_field-expected_searches.json
@@ -19,7 +19,8 @@
         "offset" : 0,
         "query" : null,
         "timerange" : null,
-        "streams" : [ ]
+        "streams" : [ ],
+        "stream_categories" : [ ]
       }, {
         "id" : "0000016e-b690-4271-0000-016eb690426f",
         "series" : [ {
@@ -35,6 +36,7 @@
         "timerange" : null,
         "rollup" : true,
         "streams" : [ ],
+        "stream_categories" : [ ],
         "row_groups" : [ {
           "type": "time",
           "field" : "timestamp",
diff --git a/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_relative_with_interval_field-expected_views.json b/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_relative_with_interval_field-expected_views.json
index 3ac30d8a5128..37fe267fb2e1 100644
--- a/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_relative_with_interval_field-expected_views.json
+++ b/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_relative_with_interval_field-expected_views.json
@@ -45,7 +45,8 @@
             "query": null,
             "filter": null,
             "timerange": null,
-            "streams": []
+            "streams": [],
+            "stream_categories" : [ ]
           },
           {
             "id": "0000016e-b690-4270-0000-016eb690426f",
@@ -60,7 +61,8 @@
             "type": "messages",
             "query": null,
             "timerange": null,
-            "streams": []
+            "streams": [],
+            "stream_categories" : [ ]
           }
         ],
         "widget_mapping": {
diff --git a/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_with_missing_fields-expected_searches.json b/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_with_missing_fields-expected_searches.json
index 15b20db53714..5167a3ec3322 100644
--- a/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_with_missing_fields-expected_searches.json
+++ b/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_with_missing_fields-expected_searches.json
@@ -28,7 +28,8 @@
       "offset" : 0,
       "query" : null,
       "timerange" : null,
-      "streams" : [ ]
+      "streams" : [ ],
+      "stream_categories" : [ ]
     }, {
       "id" : "0000016e-b690-4271-0000-016eb690426f",
       "series" : [ {
@@ -44,6 +45,7 @@
       "timerange" : null,
       "rollup" : true,
       "streams" : [ ],
+      "stream_categories" : [ ],
       "row_groups" : [ {
         "field" : "timestamp",
         "interval" : {
diff --git a/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_with_missing_fields-expected_views.json b/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_with_missing_fields-expected_views.json
index 3d52aa08e759..e0494cd78c97 100644
--- a/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_with_missing_fields-expected_views.json
+++ b/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_with_missing_fields-expected_views.json
@@ -39,7 +39,8 @@
         "query" : null,
         "filter" : null,
         "timerange" : null,
-        "streams" : [ ]
+        "streams" : [ ],
+        "stream_categories" : [ ]
       }, {
         "id" : "0000016e-b690-4270-0000-016eb690426f",
         "config" : {
@@ -49,7 +50,8 @@
         "type" : "messages",
         "query" : null,
         "timerange" : null,
-        "streams" : [ ]
+        "streams" : [ ],
+        "stream_categories" : [ ]
       } ],
       "widget_mapping" : {
         "0000016e-b690-426f-0000-016eb690426f" : [ "0000016e-b690-4271-0000-016eb690426f" ],
diff --git a/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_with_stream-expected_searches.json b/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_with_stream-expected_searches.json
index 15b20db53714..5167a3ec3322 100644
--- a/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_with_stream-expected_searches.json
+++ b/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_with_stream-expected_searches.json
@@ -28,7 +28,8 @@
       "offset" : 0,
       "query" : null,
       "timerange" : null,
-      "streams" : [ ]
+      "streams" : [ ],
+      "stream_categories" : [ ]
     }, {
       "id" : "0000016e-b690-4271-0000-016eb690426f",
       "series" : [ {
@@ -44,6 +45,7 @@
       "timerange" : null,
       "rollup" : true,
       "streams" : [ ],
+      "stream_categories" : [ ],
       "row_groups" : [ {
         "field" : "timestamp",
         "interval" : {
diff --git a/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_with_stream-expected_views.json b/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_with_stream-expected_views.json
index 3d52aa08e759..e0494cd78c97 100644
--- a/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_with_stream-expected_views.json
+++ b/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_with_stream-expected_views.json
@@ -39,7 +39,8 @@
         "query" : null,
         "filter" : null,
         "timerange" : null,
-        "streams" : [ ]
+        "streams" : [ ],
+        "stream_categories" : [ ]
       }, {
         "id" : "0000016e-b690-4270-0000-016eb690426f",
         "config" : {
@@ -49,7 +50,8 @@
         "type" : "messages",
         "query" : null,
         "timerange" : null,
-        "streams" : [ ]
+        "streams" : [ ],
+        "stream_categories" : [ ]
       } ],
       "widget_mapping" : {
         "0000016e-b690-426f-0000-016eb690426f" : [ "0000016e-b690-4271-0000-016eb690426f" ],
diff --git a/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_without_message_row-expected_searches.json b/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_without_message_row-expected_searches.json
index facca64d502d..9e76fa15d6eb 100644
--- a/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_without_message_row-expected_searches.json
+++ b/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_without_message_row-expected_searches.json
@@ -19,7 +19,8 @@
         "offset" : 0,
         "query" : null,
         "timerange" : null,
-        "streams" : [ ]
+        "streams" : [ ],
+        "stream_categories" : [ ]
       }, {
         "id" : "0000016e-b690-4271-0000-016eb690426f",
         "series" : [ {
@@ -35,6 +36,7 @@
         "timerange" : null,
         "rollup" : true,
         "streams" : [ ],
+        "stream_categories" : [ ],
         "row_groups" : [ {
           "type": "time",
           "field" : "timestamp",
diff --git a/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_without_message_row-expected_views.json b/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_without_message_row-expected_views.json
index 70d6e5ad0d63..224bfcc613f0 100644
--- a/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_without_message_row-expected_views.json
+++ b/graylog2-server/src/test/resources/org/graylog/plugins/views/migrations/V20191203120602_MigrateSavedSearchesToViewsSupport/sample_saved_search_without_message_row-expected_views.json
@@ -45,7 +45,8 @@
             "query": null,
             "filter": null,
             "timerange": null,
-            "streams": []
+            "streams": [],
+            "stream_categories" : [ ]
           },
           {
             "id": "0000016e-b690-4270-0000-016eb690426f",
@@ -60,7 +61,8 @@
             "type": "messages",
             "query": null,
             "timerange": null,
-            "streams": []
+            "streams": [],
+            "stream_categories" : [ ]
           }
         ],
         "widget_mapping": {
diff --git a/graylog2-web-interface/src/logic/streams/types.ts b/graylog2-web-interface/src/logic/streams/types.ts
index f3d12e21e48b..84153cee36e1 100644
--- a/graylog2-web-interface/src/logic/streams/types.ts
+++ b/graylog2-web-interface/src/logic/streams/types.ts
@@ -34,6 +34,7 @@ export type Stream = {
   index_set_id: string,
   is_default: boolean,
   is_editable: boolean,
+  categories: string[],
 };
 
 export type StreamRule = {
diff --git a/graylog2-web-interface/src/stores/streams/StreamsStore.ts b/graylog2-web-interface/src/stores/streams/StreamsStore.ts
index 2fd73fdce639..4976201bfb70 100644
--- a/graylog2-web-interface/src/stores/streams/StreamsStore.ts
+++ b/graylog2-web-interface/src/stores/streams/StreamsStore.ts
@@ -79,6 +79,7 @@ export type StreamResponse = {
   is_editable: boolean,
   remove_matches_from_default_stream: boolean,
   index_set_id: string,
+  categories: string[],
 }
 
 type TestMatchResponse = {
diff --git a/graylog2-web-interface/src/views/Constants.ts b/graylog2-web-interface/src/views/Constants.ts
index ef71b2b727c2..735ac39dec74 100644
--- a/graylog2-web-interface/src/views/Constants.ts
+++ b/graylog2-web-interface/src/views/Constants.ts
@@ -24,6 +24,7 @@ import type { AutoTimeConfig } from 'views/logic/aggregationbuilder/Pivot';
 export type SearchBarFormValues = {
   timerange: TimeRange,
   streams: Array<string>,
+  streamCategories: Array<string>,
   queryString: string,
 };
 
diff --git a/graylog2-web-interface/src/views/components/SearchBar.pluggableControls.test.tsx b/graylog2-web-interface/src/views/components/SearchBar.pluggableControls.test.tsx
index 657c34c92f23..c6e94ac643db 100644
--- a/graylog2-web-interface/src/views/components/SearchBar.pluggableControls.test.tsx
+++ b/graylog2-web-interface/src/views/components/SearchBar.pluggableControls.test.tsx
@@ -149,6 +149,7 @@ describe('SearchBar pluggable controls', () => {
         pluggableControl: 'Initial Value2',
         queryString: '*',
         streams: [],
+        streamCategories: [],
         timerange: { from: 300, type: 'relative' },
       },
       expect.any(Function),
@@ -164,6 +165,7 @@ describe('SearchBar pluggable controls', () => {
         pluggableControl: 'Initial Value',
         queryString: '*',
         streams: [],
+        streamCategories: [],
         timerange: { from: 300, type: 'relative' },
       },
       {
@@ -180,6 +182,7 @@ describe('SearchBar pluggable controls', () => {
       customKey: 'Initial Value',
       queryString: '*',
       streams: [],
+      streamCategories: [],
       timeRange: { from: 300, type: 'relative' },
     }, 'Europe/Berlin'));
   });
diff --git a/graylog2-web-interface/src/views/components/SearchBar.tsx b/graylog2-web-interface/src/views/components/SearchBar.tsx
index 793c5e1e5684..0524b87d6147 100644
--- a/graylog2-web-interface/src/views/components/SearchBar.tsx
+++ b/graylog2-web-interface/src/views/components/SearchBar.tsx
@@ -36,7 +36,11 @@ import { StreamsStore } from 'views/stores/StreamsStore';
 import QueryValidation from 'views/components/searchbar/queryvalidation/QueryValidation';
 import type { FilterType, QueryId } from 'views/logic/queries/Query';
 import type Query from 'views/logic/queries/Query';
-import { createElasticsearchQueryString, filtersForQuery, filtersToStreamSet } from 'views/logic/queries/Query';
+import {
+  createElasticsearchQueryString,
+  filtersToStreamSet,
+  filtersToStreamCategorySet, newFiltersForQuery,
+} from 'views/logic/queries/Query';
 import type { SearchBarFormValues } from 'views/Constants';
 import WidgetFocusContext from 'views/components/contexts/WidgetFocusContext';
 import FormWarningsContext from 'contexts/FormWarningsContext';
@@ -69,6 +73,8 @@ import QueryHistoryButton from 'views/components/searchbar/QueryHistoryButton';
 import type { Editor } from 'views/components/searchbar/queryinput/ace-types';
 import useIsLoading from 'views/hooks/useIsLoading';
 import useSearchConfiguration from 'hooks/useSearchConfiguration';
+import { defaultCompare } from 'logic/DefaultCompare';
+import StreamCategoryFilter from 'views/components/searchbar/StreamCategoryFilter';
 
 import SearchBarForm from './searchbar/SearchBarForm';
 
@@ -85,13 +91,13 @@ const StreamsAndRefresh = styled.div`
 `;
 
 const defaultOnSubmit = async (dispatch: AppDispatch, values: SearchBarFormValues, pluggableSearchBarControls: Array<() => SearchBarControl>, currentQuery: Query) => {
-  const { timerange, streams, queryString } = values;
+  const { timerange, streams, streamCategories, queryString } = values;
 
   const queryWithPluginData = await executePluggableSubmitHandler(dispatch, values, pluggableSearchBarControls, currentQuery);
 
   const newQuery = queryWithPluginData.toBuilder()
     .timerange(timerange)
-    .filter(filtersForQuery(streams))
+    .filter(newFiltersForQuery(streams, streamCategories))
     .query(createElasticsearchQueryString(queryString))
     .build();
 
@@ -116,14 +122,16 @@ const useInitialFormValues = ({ currentQuery, queryFilters }: {
   const { query_string: queryString } = query ?? {};
   const initialValuesFromPlugins = usePluggableInitialValues(currentQuery);
   const streams = filtersToStreamSet(queryFilters.get(id, Immutable.Map())).toJS();
+  const streamCategories = filtersToStreamCategorySet(queryFilters.get(id, Immutable.Map())).toJS();
 
-  return ({ timerange, streams, queryString, ...initialValuesFromPlugins });
+  return ({ timerange, streams, queryString, streamCategories, ...initialValuesFromPlugins });
 };
 
 const _validateQueryString = (values: SearchBarFormValues, pluggableSearchBarControls: Array<() => SearchBarControl>, userTimezone: string, context: HandlerContext) => {
   const request = {
     timeRange: values?.timerange,
     streams: values?.streams,
+    streamCategories: values?.streamCategories,
     queryString: values?.queryString,
     ...pluggableValidationPayload(values, context, pluggableSearchBarControls),
   };
@@ -142,6 +150,14 @@ const SearchBar = ({ onSubmit = defaultProps.onSubmit }: Props) => {
     key: stream.title,
     value: stream.id,
   })));
+  const availableStreamCategories = useStore(StreamsStore, ({ streams }) => streams.flatMap((stream) => {
+    if (stream.categories) {
+      return stream.categories.map((s) => ({ key: s, value: s }));
+    }
+
+    return [];
+  }).filter((element, index, self) => index === self.findIndex((e) => e.value === element.value),
+  ).sort((a, b) => defaultCompare(a.value, b.value)));
   const { config } = useSearchConfiguration();
   const { userTimezone } = useUserDateTime();
   const { parameters } = useParameters();
@@ -206,6 +222,18 @@ const SearchBar = ({ onSubmit = defaultProps.onSubmit }: Props) => {
                                              })} />
                             )}
                           </Field>
+                          <Field name="streamCategories">
+                            {({ field: { name, value, onChange } }) => (
+                              <StreamCategoryFilter value={value}
+                                                    streamCategories={availableStreamCategories}
+                                                    onChange={(newCategories) => onChange({
+                                                      target: {
+                                                        value: newCategories,
+                                                        name,
+                                                      },
+                                                    })} />
+                            )}
+                          </Field>
 
                           <RefreshControls disable={!isValid} />
                         </StreamsAndRefresh>
diff --git a/graylog2-web-interface/src/views/components/WidgetQueryControls.tsx b/graylog2-web-interface/src/views/components/WidgetQueryControls.tsx
index 79bf94b35bbd..7002835ef433 100644
--- a/graylog2-web-interface/src/views/components/WidgetQueryControls.tsx
+++ b/graylog2-web-interface/src/views/components/WidgetQueryControls.tsx
@@ -23,6 +23,7 @@ import isEmpty from 'lodash/isEmpty';
 import { useIsFetching } from '@tanstack/react-query';
 
 import WidgetEditApplyAllChangesContext from 'views/components/contexts/WidgetEditApplyAllChangesContext';
+import type { Stream } from 'views/stores/StreamsStore';
 import { StreamsStore } from 'views/stores/StreamsStore';
 import connect from 'stores/connect';
 import { createElasticsearchQueryString } from 'views/logic/queries/Query';
@@ -65,6 +66,8 @@ import { normalizeFromSearchBarForBackend } from 'views/logic/queries/NormalizeT
 import QueryHistoryButton from 'views/components/searchbar/QueryHistoryButton';
 import type { Editor } from 'views/components/searchbar/queryinput/ace-types';
 import useSearchConfiguration from 'hooks/useSearchConfiguration';
+import { defaultCompare } from 'logic/DefaultCompare';
+import StreamCategoryFilter from 'views/components/searchbar/StreamCategoryFilter';
 
 import TimeRangeOverrideInfo from './searchbar/WidgetTimeRangeOverride';
 import TimeRangeFilter from './searchbar/time-range-filter';
@@ -87,19 +90,20 @@ const SearchInputAndValidation = styled.div`
 `;
 
 type Props = {
-  availableStreams: Array<{ key: string, value: string }>,
+  availableStreams: Array<Stream>,
 };
 
-export const updateWidgetSearchControls = (widget, { timerange, streams, queryString }) => widget.toBuilder()
+export const updateWidgetSearchControls = (widget, { timerange, streams, streamCategories, queryString }) => widget.toBuilder()
   .timerange(timerange)
   .query(createElasticsearchQueryString(queryString))
   .streams(streams)
+  .streamCategories(streamCategories)
   .build();
 
 const onSubmit = async (dispatch: AppDispatch, values: CombinedSearchBarFormValues, pluggableSearchBarControls: Array<() => SearchBarControl>, widget: Widget) => {
-  const { timerange, streams, queryString } = values;
+  const { timerange, streams, streamCategories, queryString } = values;
   const widgetWithPluginData = await executePluggableSubmitHandler(dispatch, values, pluggableSearchBarControls, widget);
-  const newWidget = updateWidgetSearchControls(widgetWithPluginData, { timerange, streams, queryString });
+  const newWidget = updateWidgetSearchControls(widgetWithPluginData, { timerange, streams, streamCategories, queryString });
 
   if (!widget.equals(newWidget)) {
     return dispatch(updateWidget(widget.id, newWidget));
@@ -138,12 +142,12 @@ const useBindApplySearchControlsChanges = (formRef) => {
 };
 
 const useInitialFormValues = (widget: Widget) => {
-  const { streams } = widget;
+  const { streams, streamCategories } = widget;
   const timerange = widget.timerange ?? DEFAULT_TIMERANGE;
   const { query_string: queryString } = widget.query ?? createElasticsearchQueryString('');
   const initialValuesFromPlugins = usePluggableInitialValues(widget);
 
-  return useMemo(() => ({ timerange, streams, queryString, ...initialValuesFromPlugins }), [timerange, streams, queryString, initialValuesFromPlugins]);
+  return useMemo(() => ({ timerange, streams, streamCategories, queryString, ...initialValuesFromPlugins }), [timerange, streams, streamCategories, queryString, initialValuesFromPlugins]);
 };
 
 const debouncedValidateQuery = debounceWithPromise(validateQuery, 350);
@@ -154,6 +158,7 @@ const _validateQueryString = (values: SearchBarFormValues, globalOverride: Globa
     timeRange: !isEmpty(globalOverride?.timerange) ? globalOverride.timerange : values?.timerange,
     filter: globalOverride?.query ? globalOverride.query : undefined,
     streams: values?.streams,
+    streamCategories: values?.streamCategories,
     ...pluggableValidationPayload(values, context, pluggableSearchBarControls),
   };
 
@@ -182,6 +187,17 @@ const WidgetQueryControls = ({ availableStreams }: Props) => {
   const _onSubmit = useCallback((values: CombinedSearchBarFormValues) => onSubmit(dispatch, values, pluggableSearchBarControls, widget), [dispatch, pluggableSearchBarControls, widget]);
   const _resetTimeRangeOverride = useCallback(() => dispatch(resetTimeRangeOverride), [dispatch]);
   const _resetQueryOverride = useCallback(() => dispatch(resetQueryOverride), [dispatch]);
+  const allStreams = availableStreams.map((stream) => ({
+    key: stream.title,
+    value: stream.id,
+  }));
+  const availableStreamCategories = availableStreams.reduce((acc, stream: Stream) => {
+    stream.categories?.forEach((category: string) => {
+      if (!acc.find((option: { value: string }) => option.value === category)) acc.push({ key: category, value: category });
+    });
+
+    return acc;
+  }, []).sort((a, b) => defaultCompare(a.value, b.value));
 
   useBindApplySearchControlsChanges(formRef);
 
@@ -215,10 +231,22 @@ const WidgetQueryControls = ({ availableStreams }: Props) => {
                 <Field name="streams">
                   {({ field: { name, value, onChange } }) => (
                     <StreamsFilter value={value}
-                                   streams={availableStreams}
+                                   streams={allStreams}
                                    onChange={(newStreams) => onChange({ target: { value: newStreams, name } })} />
                   )}
                 </Field>
+                <Field name="streamCategories">
+                  {({ field: { name, value, onChange } }) => (
+                    <StreamCategoryFilter value={value}
+                                          streamCategories={availableStreamCategories}
+                                          onChange={(newCategories) => onChange({
+                                            target: {
+                                              value: newCategories,
+                                              name,
+                                            },
+                                          })} />
+                  )}
+                </Field>
               </TimeRangeRow>
 
               <SearchQueryRow>
@@ -281,6 +309,6 @@ export default connect(
   },
   ({ availableStreams: { streams = [] }, ...rest }) => ({
     ...rest,
-    availableStreams: streams.map((stream) => ({ key: stream.title, value: stream.id })),
+    availableStreams: streams,
   }),
 );
diff --git a/graylog2-web-interface/src/views/components/searchbar/StreamCategoryFilter.tsx b/graylog2-web-interface/src/views/components/searchbar/StreamCategoryFilter.tsx
new file mode 100644
index 000000000000..36f551642d7d
--- /dev/null
+++ b/graylog2-web-interface/src/views/components/searchbar/StreamCategoryFilter.tsx
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2020 Graylog, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the Server Side Public License, version 1,
+ * as published by MongoDB, Inc.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * Server Side Public License for more details.
+ *
+ * You should have received a copy of the Server Side Public License
+ * along with this program. If not, see
+ * <http://www.mongodb.com/licensing/server-side-public-license>.
+ */
+import React from 'react';
+import PropTypes from 'prop-types';
+import styled from 'styled-components';
+
+import Select from 'components/common/Select';
+import { defaultCompare } from 'logic/DefaultCompare';
+
+const Container = styled.div`
+  flex: 1;
+  grid-area: streams;
+`;
+
+type Props = {
+  disabled: boolean,
+  value: Array<string>,
+  streamCategories: Array<{ key: string, value: string }>,
+  onChange: (newStreamCategories: Array<string>) => void,
+};
+
+const StreamCategoryFilter = ({ disabled, value, streamCategories, onChange }: Props) => {
+  const selectedCategories = value.join(',');
+  const placeholder = 'Select stream categories the search should include.';
+  const options = streamCategories.sort(({ key: key1 }, { key: key2 }) => defaultCompare(key1, key2));
+
+  const handleChange = (selected: string) => {
+    onChange(selected === '' ? [] : selected.split(','));
+  };
+
+  if (!streamCategories || streamCategories.length < 1) return null;
+
+  return (
+    <Container data-testid="stream-category-filter" title={placeholder}>
+      <Select placeholder={placeholder}
+              disabled={disabled}
+              inputProps={{ 'aria-label': placeholder }}
+              displayKey="key"
+              inputId="stream-categories-filter"
+              onChange={handleChange}
+              options={options}
+              multi
+              value={selectedCategories} />
+    </Container>
+  );
+};
+
+StreamCategoryFilter.propTypes = {
+  disabled: PropTypes.bool,
+  value: PropTypes.arrayOf(PropTypes.string),
+  streamCategories: PropTypes.arrayOf(
+    PropTypes.shape({
+      key: PropTypes.string.isRequired,
+      value: PropTypes.string.isRequired,
+    }),
+  ).isRequired,
+  onChange: PropTypes.func.isRequired,
+};
+
+StreamCategoryFilter.defaultProps = {
+  disabled: false,
+  value: [],
+};
+
+export default StreamCategoryFilter;
diff --git a/graylog2-web-interface/src/views/components/searchbar/queryvalidation/validateQuery.ts b/graylog2-web-interface/src/views/components/searchbar/queryvalidation/validateQuery.ts
index be197bff9715..625eec4013e3 100644
--- a/graylog2-web-interface/src/views/components/searchbar/queryvalidation/validateQuery.ts
+++ b/graylog2-web-interface/src/views/components/searchbar/queryvalidation/validateQuery.ts
@@ -26,6 +26,7 @@ export type ValidationQuery = {
   queryString: ElasticsearchQueryString | string,
   timeRange?: TimeRange | undefined,
   streams?: Array<string>,
+  streamCategories?: Array<string>,
   filter?: ElasticsearchQueryString | string,
   validation_mode?: 'QUERY' | 'SEARCH_FILTER'
 }
@@ -37,6 +38,7 @@ export const validateQuery = (
     queryString,
     timeRange,
     streams,
+    streamCategories,
     filter,
     ...rest
   }: ValidationQuery,
@@ -50,6 +52,7 @@ export const validateQuery = (
     query: queryString,
     timerange: timeRange ? normalizeFromSearchBarForBackend(timeRange, userTimezone) : undefined,
     streams,
+    stream_categories: streamCategories,
     filter,
     ...rest,
   };
diff --git a/graylog2-web-interface/src/views/components/searchbar/useSearchBarSubmit.test.tsx b/graylog2-web-interface/src/views/components/searchbar/useSearchBarSubmit.test.tsx
index 01d60f961090..183822f3619d 100644
--- a/graylog2-web-interface/src/views/components/searchbar/useSearchBarSubmit.test.tsx
+++ b/graylog2-web-interface/src/views/components/searchbar/useSearchBarSubmit.test.tsx
@@ -40,6 +40,7 @@ const initialValues: SearchBarFormValues = {
   queryString: 'action:login',
   timerange: { type: 'relative', range: 300 },
   streams: [],
+  streamCategories: [],
 };
 
 const Wrapper = ({ onSubmit, values }: Props) => {
@@ -61,6 +62,7 @@ describe('useSearchBarSubmit', () => {
       queryString: ' http_method:POST ',
       streams: [],
       timerange: { type: 'relative', range: 60 },
+      streamCategories: [],
     };
     render(<Wrapper onSubmit={onSubmit} values={values} />);
 
@@ -81,6 +83,7 @@ describe('useSearchBarSubmit', () => {
       queryString: '  ',
       streams: [],
       timerange: { type: 'relative', range: 60 },
+      streamCategories: [],
     };
     render(<Wrapper onSubmit={onSubmit} values={values} />);
 
@@ -101,6 +104,7 @@ describe('useSearchBarSubmit', () => {
       queryString: ' action:login ',
       streams: [],
       timerange: { type: 'relative', range: 60 },
+      streamCategories: [],
     };
     render(<Wrapper onSubmit={onSubmit} values={values} />);
 
@@ -121,6 +125,7 @@ describe('useSearchBarSubmit', () => {
       queryString: ' http_method:POST ',
       streams: [],
       timerange: { type: 'relative', range: 60 },
+      streamCategories: [],
     };
     asMock(SearchQueryStrings.queryStringUsed).mockRejectedValue(new Error('Boom!'));
     render(<Wrapper onSubmit={onSubmit} values={values} />);
diff --git a/graylog2-web-interface/src/views/components/widgets/Widget.test.tsx b/graylog2-web-interface/src/views/components/widgets/Widget.test.tsx
index e60bc4659861..13495ff77e72 100644
--- a/graylog2-web-interface/src/views/components/widgets/Widget.test.tsx
+++ b/graylog2-web-interface/src/views/components/widgets/Widget.test.tsx
@@ -140,7 +140,6 @@ describe('<Widget />', () => {
     <TestStoreProvider>
       <SearchExplainContext.Provider value={searchExplainContext(searchedIndices)}>
         <FieldTypesContext.Provider value={fieldTypes}>
-          {}
           <WidgetFocusContext.Provider value={{ focusedWidget, setWidgetFocusing, setWidgetEditing, unsetWidgetFocusing, unsetWidgetEditing }}>
             <WidgetContext.Provider value={propsWidget}>
               <Widget widget={propsWidget}
@@ -262,8 +261,8 @@ describe('<Widget />', () => {
       .config({})
       .build();
     const UnknownWidget = (props: Partial<React.ComponentProps<typeof Widget>>) => (
-      <FieldTypesContext.Provider value={fieldTypes}>
-        <TestStoreProvider>
+      <TestStoreProvider>
+        <FieldTypesContext.Provider value={fieldTypes}>
           <WidgetContext.Provider value={unknownWidget}>
             <Widget widget={unknownWidget}
                     editing
@@ -273,8 +272,8 @@ describe('<Widget />', () => {
                     position={new WidgetPosition(1, 1, 1, 1)}
                     {...props} />
           </WidgetContext.Provider>
-        </TestStoreProvider>
-      </FieldTypesContext.Provider>
+        </FieldTypesContext.Provider>
+      </TestStoreProvider>
     );
 
     render(
diff --git a/graylog2-web-interface/src/views/logic/aggregationbuilder/AggregationWidget.ts b/graylog2-web-interface/src/views/logic/aggregationbuilder/AggregationWidget.ts
index 7e0a46cd8e9f..693dd456b8c8 100644
--- a/graylog2-web-interface/src/views/logic/aggregationbuilder/AggregationWidget.ts
+++ b/graylog2-web-interface/src/views/logic/aggregationbuilder/AggregationWidget.ts
@@ -26,8 +26,8 @@ import AggregationWidgetConfig from './AggregationWidgetConfig';
 import Widget from '../widgets/Widget';
 
 export default class AggregationWidget extends Widget {
-  constructor(id: string, config: AggregationWidgetConfig, filter?: string, timerange?: TimeRange, query?: QueryString, streams?: Array<string>, filters?: FiltersType) {
-    super(id, AggregationWidget.type, config, filter, timerange, query, streams, filters);
+  constructor(id: string, config: AggregationWidgetConfig, filter?: string, timerange?: TimeRange, query?: QueryString, streams?: Array<string>, streamCategories?: Array<string>, filters?: FiltersType) {
+    super(id, AggregationWidget.type, config, filter, timerange, query, streams, streamCategories, filters);
   }
 
   static type = 'AGGREGATION';
@@ -35,16 +35,16 @@ export default class AggregationWidget extends Widget {
   static defaultTitle = 'Untitled Aggregation';
 
   static fromJSON(value) {
-    const { id, config, filter, timerange, query, streams, filters } = value;
+    const { id, config, filter, timerange, query, streams, stream_categories, filters } = value;
 
-    return new AggregationWidget(id, AggregationWidgetConfig.fromJSON(config), filter, timerange, query, streams, filters);
+    return new AggregationWidget(id, AggregationWidgetConfig.fromJSON(config), filter, timerange, query, streams, stream_categories, filters);
   }
 
   toBuilder() {
-    const { id, config, filter, timerange, query, streams, filters } = this._value;
+    const { id, config, filter, timerange, query, streams, stream_categories, filters } = this._value;
 
     // eslint-disable-next-line @typescript-eslint/no-use-before-define
-    return new Builder(Map({ id, config, filter, timerange, query, streams, filters }));
+    return new Builder(Map({ id, config, filter, timerange, query, streams, stream_categories, filters }));
   }
 
   static builder() {
@@ -54,7 +54,7 @@ export default class AggregationWidget extends Widget {
 
   equals(other: any) {
     if (other instanceof AggregationWidget) {
-      return ['id', 'config', 'filter', 'timerange', 'query', 'streams', 'filters'].every((key) => isDeepEqual(this[key], other[key]));
+      return ['id', 'config', 'filter', 'timerange', 'query', 'streams', 'stream_categories', 'filters'].every((key) => isDeepEqual(this[key], other[key]));
     }
 
     return false;
@@ -62,7 +62,7 @@ export default class AggregationWidget extends Widget {
 
   equalsForSearch(other: any) {
     if (other instanceof AggregationWidget) {
-      return ['id', 'config', 'filter', 'timerange', 'query', 'streams', 'filters'].every((key) => isEqualForSearch(this[key], other[key]));
+      return ['id', 'config', 'filter', 'timerange', 'query', 'streams', 'stream_categories', 'filters'].every((key) => isEqualForSearch(this[key], other[key]));
     }
 
     return false;
@@ -71,8 +71,8 @@ export default class AggregationWidget extends Widget {
 
 class Builder extends Widget.Builder {
   build() {
-    const { id, config, filter, timerange, query, streams, filters } = this.value.toObject();
+    const { id, config, filter, timerange, query, streams, stream_categories, filters } = this.value.toObject();
 
-    return new AggregationWidget(id, config, filter, timerange, query, streams, filters);
+    return new AggregationWidget(id, config, filter, timerange, query, streams, stream_categories, filters);
   }
 }
diff --git a/graylog2-web-interface/src/views/logic/queries/Query.ts b/graylog2-web-interface/src/views/logic/queries/Query.ts
index 32fc29528595..2198c8df9c8a 100644
--- a/graylog2-web-interface/src/views/logic/queries/Query.ts
+++ b/graylog2-web-interface/src/views/logic/queries/Query.ts
@@ -89,6 +89,53 @@ export const filtersToStreamSet = (filter: Immutable.Map<string, any> | null | u
   return filters.map(filtersToStreamSet).reduce((prev, cur) => prev.merge(cur), Immutable.Set());
 };
 
+const _streamCategoryFilters = (selectedCategories: Array<string>) => Immutable.List(selectedCategories.map((category) => Immutable.Map({ type: 'stream_category', category: category })));
+
+export const categoryFiltersForQuery = (categories: Array<string> | null | undefined): FilterType | null | undefined => {
+  if (!categories || categories.length === 0) {
+    return null;
+  }
+
+  const categoryFilters = _streamCategoryFilters(categories);
+
+  return Immutable.Map({
+    type: 'or',
+    filters: categoryFilters,
+  });
+};
+
+export const newFiltersForQuery = (streams: Array<string> | null | undefined, categories: Array<string> | null | undefined): FilterType | null | undefined => {
+  const streamFilter: FilterType = filtersForQuery(streams);
+  const categoryFilter: FilterType = categoryFiltersForQuery(categories);
+
+  if (streamFilter && categoryFilter) {
+    const combinedFilter = Immutable.List.of(streamFilter, categoryFilter);
+
+    return Immutable.Map({
+      type: 'or',
+      filters: combinedFilter,
+    });
+  }
+
+  return streamFilter || categoryFilter;
+};
+
+export const filtersToStreamCategorySet = (filter: Immutable.Map<string, any> | null | undefined): Immutable.Set<string> => {
+  if (!filter) {
+    return Immutable.Set();
+  }
+
+  const type = filter.get('type');
+
+  if (type === 'stream_category') {
+    return Immutable.Set([filter.get('category')]);
+  }
+
+  const filters = filter.get('filters', Immutable.List());
+
+  return filters.map(filtersToStreamCategorySet).reduce((prev, cur) => prev.merge(cur), Immutable.Set());
+};
+
 export type QueryString = ElasticsearchQueryString;
 
 export type TimeRangeTypes = 'relative' | 'absolute' | 'keyword';
diff --git a/graylog2-web-interface/src/views/logic/searchtypes/SearchTypesGenerator.ts b/graylog2-web-interface/src/views/logic/searchtypes/SearchTypesGenerator.ts
index 794184c7e884..208c59e6e7d6 100644
--- a/graylog2-web-interface/src/views/logic/searchtypes/SearchTypesGenerator.ts
+++ b/graylog2-web-interface/src/views/logic/searchtypes/SearchTypesGenerator.ts
@@ -47,6 +47,7 @@ export default (widgets: (Array<Widget> | Immutable.List<Widget>)): ResultType =
         timerange: widget.timerange,
         query: widget.query,
         streams: widget.streams,
+        stream_categories: widget.streamCategories,
         ...searchType,
         widgetId: widget.id,
         ...filterForWidget(widget),
diff --git a/graylog2-web-interface/src/views/logic/views/__snapshots__/CopyPageToDashboard.test.ts.snap b/graylog2-web-interface/src/views/logic/views/__snapshots__/CopyPageToDashboard.test.ts.snap
index e9fa3ca64b89..ff9e9b99294d 100644
--- a/graylog2-web-interface/src/views/logic/views/__snapshots__/CopyPageToDashboard.test.ts.snap
+++ b/graylog2-web-interface/src/views/logic/views/__snapshots__/CopyPageToDashboard.test.ts.snap
@@ -80,6 +80,7 @@ exports[`copyPageToDashboard should copy a page to a dashboard 1`] = `
             "query_string": "",
             "type": "elasticsearch",
           },
+          "stream_categories": undefined,
           "streams": [],
           "timerange": null,
           "type": "aggregation",
diff --git a/graylog2-web-interface/src/views/logic/views/__snapshots__/CopyWidgetToDashboard.test.ts.snap b/graylog2-web-interface/src/views/logic/views/__snapshots__/CopyWidgetToDashboard.test.ts.snap
index 2aa6746f865e..40e2f74db2f5 100644
--- a/graylog2-web-interface/src/views/logic/views/__snapshots__/CopyWidgetToDashboard.test.ts.snap
+++ b/graylog2-web-interface/src/views/logic/views/__snapshots__/CopyWidgetToDashboard.test.ts.snap
@@ -103,6 +103,7 @@ exports[`copyWidgetToDashboard should copy a widget to a dashboard 1`] = `
             "query_string": "",
             "type": "elasticsearch",
           },
+          "stream_categories": undefined,
           "streams": [],
           "timerange": null,
           "type": "aggregation",
@@ -130,6 +131,7 @@ exports[`copyWidgetToDashboard should copy a widget to a dashboard 1`] = `
             "query_string": "",
             "type": "elasticsearch",
           },
+          "stream_categories": undefined,
           "streams": [],
           "timerange": {
             "range": 300,
diff --git a/graylog2-web-interface/src/views/logic/views/__snapshots__/MoveWidgetToTab.test.ts.snap b/graylog2-web-interface/src/views/logic/views/__snapshots__/MoveWidgetToTab.test.ts.snap
index 4954d8945c9a..cb0303a6def0 100644
--- a/graylog2-web-interface/src/views/logic/views/__snapshots__/MoveWidgetToTab.test.ts.snap
+++ b/graylog2-web-interface/src/views/logic/views/__snapshots__/MoveWidgetToTab.test.ts.snap
@@ -54,6 +54,7 @@ exports[`MoveWidgetToTab should copy a Widget to a dashboard 1`] = `
           "filters": Immutable.List [],
           "id": "b34c3c6f-c49d-41d3-a65a-f746134f8f3e",
           "query": null,
+          "stream_categories": undefined,
           "streams": [],
           "timerange": null,
           "type": "aggregation",
@@ -105,6 +106,7 @@ exports[`MoveWidgetToTab should copy a Widget to a dashboard 1`] = `
           "filters": Immutable.List [],
           "id": "dead-beef",
           "query": null,
+          "stream_categories": undefined,
           "streams": [],
           "timerange": null,
           "type": "aggregation",
@@ -184,6 +186,7 @@ exports[`MoveWidgetToTab should move a Widget to a dashboard 1`] = `
           "filters": Immutable.List [],
           "id": "b34c3c6f-c49d-41d3-a65a-f746134f8f3e",
           "query": null,
+          "stream_categories": undefined,
           "streams": [],
           "timerange": null,
           "type": "aggregation",
@@ -256,6 +259,7 @@ exports[`MoveWidgetToTab should provide a default position in case the widgets p
           "filters": Immutable.List [],
           "id": "b34c3c6f-c49d-41d3-a65a-f746134f8f3e",
           "query": null,
+          "stream_categories": undefined,
           "streams": [],
           "timerange": null,
           "type": "aggregation",
@@ -329,6 +333,7 @@ exports[`MoveWidgetToTab should work when titles are empty 1`] = `
           "filters": Immutable.List [],
           "id": "b34c3c6f-c49d-41d3-a65a-f746134f8f3e",
           "query": null,
+          "stream_categories": undefined,
           "streams": [],
           "timerange": null,
           "type": "aggregation",
diff --git a/graylog2-web-interface/src/views/logic/views/__snapshots__/UpdateSearchForWidgets.test.ts.snap b/graylog2-web-interface/src/views/logic/views/__snapshots__/UpdateSearchForWidgets.test.ts.snap
index c8ea19026416..13f060992416 100644
--- a/graylog2-web-interface/src/views/logic/views/__snapshots__/UpdateSearchForWidgets.test.ts.snap
+++ b/graylog2-web-interface/src/views/logic/views/__snapshots__/UpdateSearchForWidgets.test.ts.snap
@@ -149,6 +149,7 @@ exports[`UpdateSearchForWidgets should generate a new search for the view 1`] =
           "filters": Immutable.List [],
           "id": "dc4a61b2-26e6-468e-bac2-f7702846ca92",
           "query": null,
+          "stream_categories": undefined,
           "streams": [],
           "timerange": null,
           "type": "aggregation",
@@ -174,6 +175,7 @@ exports[`UpdateSearchForWidgets should generate a new search for the view 1`] =
           "filters": Immutable.List [],
           "id": "fb496a41-4358-4bc8-b19f-244c71fe9143",
           "query": null,
+          "stream_categories": undefined,
           "streams": [],
           "timerange": null,
           "type": "aggregation",
@@ -218,6 +220,7 @@ exports[`UpdateSearchForWidgets should generate a new search for the view 1`] =
           "filters": Immutable.List [],
           "id": "ec997825-6065-4fb7-ba86-427e74109ee4",
           "query": null,
+          "stream_categories": undefined,
           "streams": [],
           "timerange": null,
           "type": "aggregation",
@@ -243,6 +246,7 @@ exports[`UpdateSearchForWidgets should generate a new search for the view 1`] =
           "filters": Immutable.List [],
           "id": "c78e9a51-2e36-4ec4-86de-9df4d29f0863",
           "query": null,
+          "stream_categories": undefined,
           "streams": [],
           "timerange": null,
           "type": "aggregation",
@@ -294,6 +298,7 @@ exports[`UpdateSearchForWidgets should generate a new search for the view 1`] =
           "filters": Immutable.List [],
           "id": "897a0961-a548-4651-9ca6-f3d6f21b8379",
           "query": null,
+          "stream_categories": undefined,
           "streams": [],
           "timerange": null,
           "type": "aggregation",
@@ -330,6 +335,7 @@ exports[`UpdateSearchForWidgets should generate a new search for the view 1`] =
           "filters": Immutable.List [],
           "id": "98ccf13e-6dec-4362-bcf3-a4776f457061",
           "query": null,
+          "stream_categories": undefined,
           "streams": [],
           "timerange": null,
           "type": "aggregation",
@@ -355,6 +361,7 @@ exports[`UpdateSearchForWidgets should generate a new search for the view 1`] =
           "filters": Immutable.List [],
           "id": "3d568826-fe3d-413a-99a6-09e51d82c851",
           "query": null,
+          "stream_categories": undefined,
           "streams": [],
           "timerange": null,
           "type": "aggregation",
@@ -373,6 +380,7 @@ exports[`UpdateSearchForWidgets should generate a new search for the view 1`] =
           "filters": Immutable.List [],
           "id": "ef9e676a-2d08-4433-b082-2617878a6e59",
           "query": null,
+          "stream_categories": undefined,
           "streams": [],
           "timerange": null,
           "type": "messages",
diff --git a/graylog2-web-interface/src/views/logic/views/__snapshots__/ViewTransformer.test.ts.snap b/graylog2-web-interface/src/views/logic/views/__snapshots__/ViewTransformer.test.ts.snap
index c2d80f929078..79762f15ef83 100644
--- a/graylog2-web-interface/src/views/logic/views/__snapshots__/ViewTransformer.test.ts.snap
+++ b/graylog2-web-interface/src/views/logic/views/__snapshots__/ViewTransformer.test.ts.snap
@@ -130,6 +130,7 @@ exports[`ViewTransformer transform with all attributes should transform a view w
               "query_string": "",
               "type": "elasticsearch",
             },
+            "stream_categories": undefined,
             "streams": [
               "5cdab2293d27467fbe9e8a72",
             ],
@@ -174,6 +175,7 @@ exports[`ViewTransformer transform with all attributes should transform a view w
               "query_string": "",
               "type": "elasticsearch",
             },
+            "stream_categories": undefined,
             "streams": [
               "5cdab2293d27467fbe9e8a72",
             ],
diff --git a/graylog2-web-interface/src/views/logic/widgets/MessagesWidget.ts b/graylog2-web-interface/src/views/logic/widgets/MessagesWidget.ts
index 35ded4697d46..f1549da911cb 100644
--- a/graylog2-web-interface/src/views/logic/widgets/MessagesWidget.ts
+++ b/graylog2-web-interface/src/views/logic/widgets/MessagesWidget.ts
@@ -27,8 +27,8 @@ import type { WidgetState } from './Widget';
 import type { QueryString, TimeRange } from '../queries/Query';
 
 export default class MessagesWidget extends Widget {
-  constructor(id: string, config: any, filter: string | undefined | null, timerange: TimeRange | undefined | null, query: QueryString | undefined | null, streams: Array<string>, filters?: FiltersType) {
-    super(id, MessagesWidget.type, config, filter, timerange, query, streams, filters);
+  constructor(id: string, config: any, filter: string | undefined | null, timerange: TimeRange | undefined | null, query: QueryString | undefined | null, streams: Array<string>, streamCategories: Array<string>, filters?: FiltersType) {
+    super(id, MessagesWidget.type, config, filter, timerange, query, streams, streamCategories, filters);
   }
 
   static type = 'messages';
@@ -41,14 +41,14 @@ export default class MessagesWidget extends Widget {
   }
 
   static fromJSON(value: WidgetState) {
-    const { id, config, filter, timerange, query, streams, filters } = value;
+    const { id, config, filter, timerange, query, streams, stream_categories, filters } = value;
 
-    return new MessagesWidget(id, MessagesWidgetConfig.fromJSON(config), filter, timerange, query, streams, filters);
+    return new MessagesWidget(id, MessagesWidgetConfig.fromJSON(config), filter, timerange, query, streams, stream_categories, filters);
   }
 
   equals(other: any) {
     if (other instanceof MessagesWidget) {
-      return ['id', 'config', 'filter', 'timerange', 'query', 'streams', 'filters'].every((key) => isDeepEqual(this._value[key], other[key]));
+      return ['id', 'config', 'filter', 'timerange', 'query', 'streams', 'stream_categories', 'filters'].every((key) => isDeepEqual(this._value[key], other[key]));
     }
 
     return false;
@@ -60,17 +60,17 @@ export default class MessagesWidget extends Widget {
 
   equalsForSearch(other: any) {
     if (other instanceof MessagesWidget) {
-      return ['id', 'config', 'filter', 'timerange', 'query', 'streams', 'filters'].every((key) => isEqualForSearch(this._value[key], other[key]));
+      return ['id', 'config', 'filter', 'timerange', 'query', 'streams', 'stream_categories', 'filters'].every((key) => isEqualForSearch(this._value[key], other[key]));
     }
 
     return false;
   }
 
   toBuilder() {
-    const { id, config, filter, timerange, query, streams, filters } = this._value;
+    const { id, config, filter, timerange, query, streams, stream_categories, filters } = this._value;
 
     // eslint-disable-next-line @typescript-eslint/no-use-before-define
-    return new Builder(Map({ id, config, filter, timerange, query, streams, filters }));
+    return new Builder(Map({ id, config, filter, timerange, query, streams, stream_categories, filters }));
   }
 
   static builder() {
@@ -85,8 +85,8 @@ export default class MessagesWidget extends Widget {
 
 class Builder extends Widget.Builder {
   build(): MessagesWidget {
-    const { id, config, filter, timerange, query, streams, filters } = this.value.toObject();
+    const { id, config, filter, timerange, query, streams, stream_categories, filters } = this.value.toObject();
 
-    return new MessagesWidget(id, config, filter, timerange, query, streams, filters);
+    return new MessagesWidget(id, config, filter, timerange, query, streams, stream_categories, filters);
   }
 }
diff --git a/graylog2-web-interface/src/views/logic/widgets/Widget.ts b/graylog2-web-interface/src/views/logic/widgets/Widget.ts
index c82aa76c30ea..7ca5a59077f3 100644
--- a/graylog2-web-interface/src/views/logic/widgets/Widget.ts
+++ b/graylog2-web-interface/src/views/logic/widgets/Widget.ts
@@ -32,6 +32,7 @@ export type WidgetState = {
   timerange: TimeRange | null | undefined;
   query: QueryString | null | undefined;
   streams: Array<string>;
+  stream_categories: Array<string>;
 };
 
 type DeserializesWidgets = {
@@ -45,8 +46,8 @@ class Widget {
 
   static Builder: typeof Builder;
 
-  constructor(id: string, type: string, config: any, filter?: string, timerange?: TimeRange, query?: QueryString, streams?: Array<string>, filters?: FiltersType | Array<SearchFilter>) {
-    this._value = { id, type, config, filter: filter === null ? undefined : filter, filters: List(filters), timerange, query, streams };
+  constructor(id: string, type: string, config: any, filter?: string, timerange?: TimeRange, query?: QueryString, streams?: Array<string>, streamCategories?: Array<string>, filters?: FiltersType | Array<SearchFilter>) {
+    this._value = { id, type, config, filter: filter === null ? undefined : filter, filters: List(filters), timerange, query, streams, stream_categories: streamCategories };
   }
 
   get id(): string {
@@ -81,6 +82,10 @@ class Widget {
     return this._value.streams;
   }
 
+  get streamCategories(): Array<string> {
+    return this._value.stream_categories;
+  }
+
   // eslint-disable-next-line class-methods-use-this
   get isExportable() {
     return false;
@@ -106,7 +111,8 @@ class Widget {
       && isDeepEqual(this.config, other.config)
       && isDeepEqual(this.timerange, other.timerange)
       && isDeepEqual(this.query, other.query)
-      && isDeepEqual(this.streams, other.streams);
+      && isDeepEqual(this.streams, other.streams)
+      && isDeepEqual(this.streamCategories, other.streamCategories);
   }
 
   duplicate(newId: string): Widget {
@@ -123,10 +129,11 @@ class Widget {
       timerange,
       query,
       streams,
+      stream_categories,
     } = this._value;
 
     // eslint-disable-next-line @typescript-eslint/no-use-before-define
-    return new Builder(Map({ id, type, config, filter, filters, timerange, query, streams }));
+    return new Builder(Map({ id, type, config, filter, filters, timerange, query, streams, stream_categories }));
   }
 
   toJSON() {
@@ -139,9 +146,10 @@ class Widget {
       timerange,
       query,
       streams,
+      stream_categories,
     } = this._value;
 
-    return { id, type: type.toLowerCase(), config, filter, filters, timerange, query, streams };
+    return { id, type: type.toLowerCase(), config, filter, filters, timerange, query, streams, stream_categories };
   }
 
   static fromJSON(value: WidgetState): Widget {
@@ -154,6 +162,7 @@ class Widget {
       timerange,
       query,
       streams,
+      stream_categories,
     } = value;
     const implementingClass = Widget.__registrations[type.toLowerCase()];
 
@@ -161,7 +170,7 @@ class Widget {
       return implementingClass.fromJSON(value);
     }
 
-    return new Widget(id, type, config, filter, timerange, query, streams, filters);
+    return new Widget(id, type, config, filter, timerange, query, streams, stream_categories, filters);
   }
 
   static empty() {
@@ -241,6 +250,12 @@ class Builder {
     return this;
   }
 
+  streamCategories(value: Array<string>) {
+    this.value = this.value.set('stream_categories', value);
+
+    return this;
+  }
+
   build(): Widget {
     const {
       id,
@@ -251,9 +266,10 @@ class Builder {
       timerange,
       query,
       streams,
+      stream_categories: streamCategories,
     } = this.value.toObject();
 
-    return new Widget(id, type, config, filter, timerange, query, streams, filters);
+    return new Widget(id, type, config, filter, timerange, query, streams, streamCategories, filters);
   }
 }
 
diff --git a/graylog2-web-interface/src/views/logic/widgets/events/EventsWidget.ts b/graylog2-web-interface/src/views/logic/widgets/events/EventsWidget.ts
index c94aa453cf04..0d0b351ab806 100644
--- a/graylog2-web-interface/src/views/logic/widgets/events/EventsWidget.ts
+++ b/graylog2-web-interface/src/views/logic/widgets/events/EventsWidget.ts
@@ -26,7 +26,7 @@ import type { FiltersType } from 'views/types';
 import EventsWidgetConfig from './EventsWidgetConfig';
 
 export default class EventsWidget extends Widget {
-  constructor(id: string, config: EventsWidgetConfig, filter?: string, timerange?: TimeRange, query?: QueryString, streams?: Array<string>, filters?: FiltersType) {
+  constructor(id: string, config: EventsWidgetConfig, filter?: string, timerange?: TimeRange, query?: QueryString, streams?: Array<string>, streamCategories?: Array<string>, filters?: FiltersType) {
     super(
       id,
       EventsWidget.type,
@@ -35,6 +35,7 @@ export default class EventsWidget extends Widget {
       timerange,
       query,
       streams,
+      streamCategories,
       filters,
     );
   }
@@ -44,14 +45,14 @@ export default class EventsWidget extends Widget {
   static defaultTitle = 'Untitled Events Overview';
 
   static fromJSON(value: WidgetState) {
-    const { id, config, filter, timerange, query, streams, filters } = value;
+    const { id, config, filter, timerange, query, streams, stream_categories, filters } = value;
 
-    return new EventsWidget(id, EventsWidgetConfig.fromJSON(config), filter, timerange, query, streams, filters);
+    return new EventsWidget(id, EventsWidgetConfig.fromJSON(config), filter, timerange, query, streams, stream_categories, filters);
   }
 
   equals(other: any) {
     if (other instanceof EventsWidget) {
-      return ['id', 'config', 'filter', 'timerange', 'query', 'streams', 'filters'].every((key) => isDeepEqual(this._value[key], other[key]));
+      return ['id', 'config', 'filter', 'timerange', 'query', 'streams', 'stream_categories', 'filters'].every((key) => isDeepEqual(this._value[key], other[key]));
     }
 
     return false;
@@ -59,17 +60,17 @@ export default class EventsWidget extends Widget {
 
   equalsForSearch(other: any) {
     if (other instanceof EventsWidget) {
-      return ['id', 'config', 'filter', 'timerange', 'query', 'streams', 'filters'].every((key) => isEqualForSearch(this._value[key], other[key]));
+      return ['id', 'config', 'filter', 'timerange', 'query', 'streams', 'stream_categories', 'filters'].every((key) => isEqualForSearch(this._value[key], other[key]));
     }
 
     return false;
   }
 
   toBuilder() {
-    const { id, config, filter, timerange, query, streams, filters } = this._value;
+    const { id, config, filter, timerange, query, streams, stream_categories, filters } = this._value;
 
     // eslint-disable-next-line @typescript-eslint/no-use-before-define
-    return new Builder(Map({ id, config, filter, timerange, query, streams, filters }));
+    return new Builder(Map({ id, config, filter, timerange, query, streams, stream_categories, filters }));
   }
 
   static builder() {
@@ -80,8 +81,8 @@ export default class EventsWidget extends Widget {
 
 class Builder extends Widget.Builder {
   build(): EventsWidget {
-    const { id, config, filter, timerange, query, streams, filters } = this.value.toObject();
+    const { id, config, filter, timerange, query, streams, stream_categories, filters } = this.value.toObject();
 
-    return new EventsWidget(id, config, filter, timerange, query, streams, filters);
+    return new EventsWidget(id, config, filter, timerange, query, streams, stream_categories, filters);
   }
 }
diff --git a/graylog2-web-interface/src/views/types.ts b/graylog2-web-interface/src/views/types.ts
index 88a2e1a5fdfb..f4b5a824d9ca 100644
--- a/graylog2-web-interface/src/views/types.ts
+++ b/graylog2-web-interface/src/views/types.ts
@@ -343,6 +343,7 @@ interface MessageRowOverrideProps {
 export interface CombinedSearchBarFormValues {
   timerange?: TimeRange | NoTimeRangeOverride,
   streams?: Array<string>,
+  streamCategories?: Array<string>,
   queryString?: string,
 }
 
diff --git a/graylog2-web-interface/test/fixtures/streams.ts b/graylog2-web-interface/test/fixtures/streams.ts
index 1a96a2742b54..8358a65577fc 100644
--- a/graylog2-web-interface/test/fixtures/streams.ts
+++ b/graylog2-web-interface/test/fixtures/streams.ts
@@ -33,4 +33,84 @@ export const stream: Stream = {
   remove_matches_from_default_stream: false,
   rules: [],
   title: 'Example stream',
+  categories: [],
 };
+/**
+ *     const streams = [
+ *       { key: 'One Stream', value: 'streamId1' },
+ *       { key: 'another Stream', value: 'streamId2' },
+ *       { key: 'Yet another Stream', value: 'streamId3' },
+ *       { key: '101 Stream', value: 'streamId4' },
+ *     ];
+ */
+
+export const streams: Stream[] = [
+  {
+    content_pack: null,
+    created_at: '2020-10-10T10:10:00.000Z',
+    creator_user_id: 'admin',
+    description: 'Lorem ipsum dolor sit amet',
+    disabled: true,
+    id: 'streamId1',
+    index_set_id: 'index-set-id-1',
+    is_default: false,
+    is_editable: true,
+    matching_type: 'AND',
+    outputs: [],
+    remove_matches_from_default_stream: false,
+    rules: [],
+    title: 'One Stream',
+    categories: [],
+  },
+  {
+    content_pack: null,
+    created_at: '2020-10-10T10:10:00.000Z',
+    creator_user_id: 'admin',
+    description: 'Lorem ipsum dolor sit amet',
+    disabled: true,
+    id: 'streamId2',
+    index_set_id: 'index-set-id-1',
+    is_default: false,
+    is_editable: true,
+    matching_type: 'AND',
+    outputs: [],
+    remove_matches_from_default_stream: false,
+    rules: [],
+    title: 'another Stream',
+    categories: [],
+  },
+  {
+    content_pack: null,
+    created_at: '2020-10-10T10:10:00.000Z',
+    creator_user_id: 'admin',
+    description: 'Lorem ipsum dolor sit amet',
+    disabled: true,
+    id: 'streamId3',
+    index_set_id: 'index-set-id-1',
+    is_default: false,
+    is_editable: true,
+    matching_type: 'AND',
+    outputs: [],
+    remove_matches_from_default_stream: false,
+    rules: [],
+    title: 'Yet another Stream',
+    categories: [],
+  },
+  {
+    content_pack: null,
+    created_at: '2020-10-10T10:10:00.000Z',
+    creator_user_id: 'admin',
+    description: 'Lorem ipsum dolor sit amet',
+    disabled: true,
+    id: 'streamId4',
+    index_set_id: 'index-set-id-1',
+    is_default: false,
+    is_editable: true,
+    matching_type: 'AND',
+    outputs: [],
+    remove_matches_from_default_stream: false,
+    rules: [],
+    title: '101 Stream',
+    categories: [],
+  },
+];