diff --git a/CHANGELOG.md b/CHANGELOG.md
index d871a1258..5ca71c164 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Improved the usability of the date range selector in the assistant
 - Refactored the holding detail dialog to a standalone component
 - Refreshed the cryptocurrencies list
 - Refactored various pages to standalone components
diff --git a/libs/ui/src/lib/assistant/assistant.component.ts b/libs/ui/src/lib/assistant/assistant.component.ts
index 101872a86..58d41a564 100644
--- a/libs/ui/src/lib/assistant/assistant.component.ts
+++ b/libs/ui/src/lib/assistant/assistant.component.ts
@@ -228,12 +228,7 @@ export class GfAssistantComponent implements OnChanges, OnDestroy, OnInit {
       {
         label: '1 ' + $localize`year` + ' (' + $localize`1Y` + ')',
         value: '1y'
-      },
-      {
-        label: '5 ' + $localize`years` + ' (' + $localize`5Y` + ')',
-        value: '5y'
-      },
-      { label: $localize`Max`, value: 'max' }
+      }
     ];
 
     if (this.user?.settings?.isExperimentalFeatures) {
@@ -250,6 +245,14 @@ export class GfAssistantComponent implements OnChanges, OnDestroy, OnInit {
       );
     }
 
+    this.dateRangeOptions = this.dateRangeOptions.concat([
+      {
+        label: '5 ' + $localize`years` + ' (' + $localize`5Y` + ')',
+        value: '5y'
+      },
+      { label: $localize`Max`, value: 'max' }
+    ]);
+
     this.dateRangeFormControl.setValue(this.user?.settings?.dateRange ?? null);
 
     this.filterForm.setValue(