1 files changed, 12 insertions, 4 deletions
diff --git a/src/client/views/nodes/FilterBox.tsx b/src/client/views/nodes/FilterBox.tsx
index 30d7ed187..2f354c2da 100644
--- a/src/client/views/nodes/FilterBox.tsx
+++ b/src/client/views/nodes/FilterBox.tsx
@@ -287,14 +287,22 @@ export class FilterBox extends ViewBoxBaseComponent<FieldViewProps, FilterBoxDoc
     @action
     changeScope = (e: any) => {
         if (FilterBox._filterScope === "Current Dashboard" && e.currentTarget.value === "Current Collection") {
-            const temp = CurrentUserUtils.ActiveDashboard._docFilters;
+            const currentDashboardDocFilters = CurrentUserUtils.ActiveDashboard._docFilters;
             CurrentUserUtils.ActiveDashboard._docFilters = new List<string>();
-            (CurrentUserUtils.ActiveDashboard.currentFilter as Doc)._docFilterList = temp;
+            (CurrentUserUtils.ActiveDashboard.currentFilter as Doc)._docFilterList = currentDashboardDocFilters;
+
+            const currentDashboardDocRangeFilters = CurrentUserUtils.ActiveDashboard._docRangeFilters;
+            CurrentUserUtils.ActiveDashboard._docRangeFilters = new List<string>();
+            (CurrentUserUtils.ActiveDashboard.currentFilter as Doc)._docRangeFilterList = currentDashboardDocRangeFilters;
         }
         else if (FilterBox._filterScope === "Current Collection" && e.currentTarget.value === "Current Dashboard") {
-            const temp = (CurrentUserUtils.ActiveDashboard.currentFilter as Doc)._docFilterList;
+            const savedDashboardDocFilters = (CurrentUserUtils.ActiveDashboard.currentFilter as Doc)._docFilterList;
             (CurrentUserUtils.ActiveDashboard.currentFilter as Doc)._docFilterList = undefined;
-            CurrentUserUtils.ActiveDashboard._docFilters = temp;
+            CurrentUserUtils.ActiveDashboard._docFilters = savedDashboardDocFilters;
+
+            const savedDashboardDocRangeFilters = (CurrentUserUtils.ActiveDashboard.currentFilter as Doc)._docRangeFilterList;
+            (CurrentUserUtils.ActiveDashboard.currentFilter as Doc)._docRangeFilterList = undefined;
+            CurrentUserUtils.ActiveDashboard._docRangeFilters = savedDashboardDocRangeFilters;
         }
         FilterBox._filterScope = e.currentTarget.value;
     }