diff --git a/ui/src/Components/NavBar/FilterInput/History.js b/ui/src/Components/NavBar/FilterInput/History.js
index f48c21471..bb5327516 100644
--- a/ui/src/Components/NavBar/FilterInput/History.js
+++ b/ui/src/Components/NavBar/FilterInput/History.js
@@ -184,7 +184,7 @@ const History = observer(
       // also check for value, name might be missing for fuzzy filters, but
       // the value should always be set
       const validAppliedFilters = alertStore.filters.values
-        .filter(f => f.applied === true && f.isValid === true && f.value)
+        .filter(f => f.applied && f.isValid && f.value)
         .map(f => ReduceFilter(f));
 
       // don't store empty filters in history
diff --git a/ui/src/Components/NavBar/FilterInput/History.test.js b/ui/src/Components/NavBar/FilterInput/History.test.js
index e99b0ff09..1698660c4 100644
--- a/ui/src/Components/NavBar/FilterInput/History.test.js
+++ b/ui/src/Components/NavBar/FilterInput/History.test.js
@@ -36,6 +36,22 @@ const ShallowHistoryMenu = historyTree => {
   return tree;
 };
 
+const MountedHistoryMenu = historyTree => {
+  const tree = mount(
+    <HistoryMenu
+      popperPlacement={null}
+      popperRef={null}
+      popperStyle={null}
+      filters={historyTree.instance().history.filters}
+      onClear={historyTree.instance().clearHistory}
+      alertStore={historyTree.props().alertStore}
+      settingsStore={historyTree.props().settingsStore}
+      afterClick={historyTree.instance().collapse.hide}
+    />
+  );
+  return tree;
+};
+
 const AppliedFilter = (name, matcher, value) => {
   const filter = NewUnappliedFilter(`${name}${matcher}${value}`);
   filter.applied = true;
@@ -45,6 +61,16 @@ const AppliedFilter = (name, matcher, value) => {
   return filter;
 };
 
+const PopulateHistory = (instance, count) => {
+  for (let i = 1; i <= count; i++) {
+    alertStore.filters.values = [
+      AppliedFilter("foo", "=", `bar${i}`),
+      AppliedFilter("baz", "=~", `bar${i}`)
+    ];
+    instance.appendToHistory();
+  }
+};
+
 describe("<History />", () => {
   it("renders dropdown button when menu is hidden", () => {
     const tree = MountedHistory();
@@ -93,16 +119,90 @@ describe("<HistoryMenu />", () => {
   });
 
   it("renders correctly when rendered with a filter in history", () => {
-    alertStore.filters.values = [AppliedFilter("foo", "=~", "bar")];
     const historyTree = MountedHistory();
-    historyTree.instance().appendToHistory();
+    PopulateHistory(historyTree.instance(), 1);
 
     const tree = ShallowHistoryMenu(historyTree);
     expect(tree.text()).toBe(
-      "<FontAwesomeIcon />Last used filters<HistoryLabel /><ActionButton /><ActionButton /><ActionButton />"
+      "<FontAwesomeIcon />Last used filters<HistoryLabel /><HistoryLabel /><ActionButton /><ActionButton /><ActionButton />"
     );
 
-    const label = tree.find("HistoryLabel");
-    expect(label.html()).toMatch(/>foo=~bar</);
+    const labels = tree.find("HistoryLabel");
+    expect(labels).toHaveLength(2);
+    expect(labels.at(0).html()).toMatch(/>foo=bar1</);
+    expect(labels.at(1).html()).toMatch(/>baz=~bar1</);
+  });
+
+  it("stores only up to maxSize last filter sets in history storage", () => {
+    const historyTree = MountedHistory();
+    const instance = historyTree.instance();
+    const maxSize = instance.maxSize;
+    PopulateHistory(instance, maxSize * 2);
+    expect(instance.history.filters).toHaveLength(maxSize);
+  });
+
+  it("renders only up to maxSize last filter sets in history", () => {
+    const historyTree = MountedHistory();
+    const instance = historyTree.instance();
+    PopulateHistory(instance, instance.maxSize * 2);
+
+    const tree = ShallowHistoryMenu(historyTree);
+    const labelSets = tree.find(".components-navbar-historymenu-labels");
+    expect(labelSets).toHaveLength(8);
+
+    // oldest pushed label should be rendered last
+    const labelsLast = labelSets.last().find("HistoryLabel");
+    expect(labelsLast).toHaveLength(2);
+    expect(labelsLast.at(0).html()).toMatch(/>foo=bar9</);
+    expect(labelsLast.at(1).html()).toMatch(/>baz=~bar9</);
+
+    // most recently pushed label should be rendered fist
+    const labelsFist = labelSets.first().find("HistoryLabel");
+    expect(labelsFist).toHaveLength(2);
+    expect(labelsFist.at(0).html()).toMatch(/>foo=bar16</);
+    expect(labelsFist.at(1).html()).toMatch(/>baz=~bar16</);
+  });
+
+  it("clicking on 'Save filters' saves current filter set to Settings", () => {
+    alertStore.filters.values = [
+      AppliedFilter("foo", "=", "bar"),
+      AppliedFilter("bar", "=~", "baz")
+    ];
+
+    const historyTree = MountedHistory();
+    const tree = MountedHistoryMenu(historyTree);
+    const button = tree.find(".component-history-button").at(0);
+    expect(button.text()).toBe("Save filters");
+
+    button.simulate("click");
+    expect(settingsStore.savedFilters.config.filters).toHaveLength(2);
+    expect(settingsStore.savedFilters.config.filters).toContain("foo=bar");
+    expect(settingsStore.savedFilters.config.filters).toContain("bar=~baz");
+  });
+
+  it("clicking on 'Reset filters' clears current filter set in Settings", () => {
+    settingsStore.savedFilters.config.filters = ["foo=bar"];
+
+    const historyTree = MountedHistory();
+    const tree = MountedHistoryMenu(historyTree);
+    const button = tree.find(".component-history-button").at(1);
+    expect(button.text()).toBe("Reset filters");
+
+    button.simulate("click");
+    expect(settingsStore.savedFilters.config.filters).toHaveLength(0);
+  });
+
+  it("clicking on 'Clear history' clears the history", () => {
+    const historyTree = MountedHistory();
+    const instance = historyTree.instance();
+    PopulateHistory(instance, 5);
+    expect(instance.history.filters).toHaveLength(5);
+
+    const tree = MountedHistoryMenu(historyTree);
+    const button = tree.find(".component-history-button").at(2);
+    expect(button.text()).toBe("Clear history");
+
+    button.simulate("click");
+    expect(instance.history.filters).toHaveLength(0);
   });
 });