diff --git a/static/js/chart_controls.js b/static/js/chart_controls.js
index 75a6127..69c8199 100644
--- a/static/js/chart_controls.js
+++ b/static/js/chart_controls.js
@@ -96,13 +96,31 @@ document.addEventListener("DOMContentLoaded", function () {
             const r = this.getAttribute("data-range"); // last30days/currentmonth/monthly/quarterly/halfyearly/yearly
 
             // Zakresy kubełkowane – bez start/end, bez "daily"
-            if (["monthly", "quarterly", "halfyearly", "yearly", "currentmonth", "last30days"].includes(r)) {
+            if (["monthly", "quarterly", "halfyearly", "yearly"].includes(r)) {
                 if (startDateInput) startDateInput.value = "";
                 if (endDateInput) endDateInput.value = "";
-                window.loadExpenses(r); // => /expenses_data?range=<r>
+                window.loadExpenses(r); // => /expenses_data?range=monthly|quarterly|halfyearly|yearly
                 return;
             }
 
+            if (r === "currentmonth") {
+                const t = today();
+                const first = new Date(t.getFullYear(), t.getMonth(), 1);
+                if (isDailyActive()) {
+                    window.loadExpenses("daily", iso(first), iso(t));
+                } else {
+                    window.loadExpenses("monthly", iso(first), iso(t));
+                }
+                return;
+            }
+            if (r === "last30days") {
+                if (isDailyActive()) {
+                    window.loadExpenses("daily", iso(daysAgo(30)), iso(today()));
+                } else {
+                    window.loadExpenses("last30days");
+                }
+                return;
+            }
 
             // reset pickera
             if (startDateInput) startDateInput.value = "";