diff --git a/frontend/src/ts/controllers/chart-controller.ts b/frontend/src/ts/controllers/chart-controller.ts
index af7bb8e6fb78..faec3da680be 100644
--- a/frontend/src/ts/controllers/chart-controller.ts
+++ b/frontend/src/ts/controllers/chart-controller.ts
@@ -1356,10 +1356,7 @@ createDebouncedEffectOn(125, getTheme, (theme) => {
 
 ConfigEvent.subscribe(({ key, newValue }) => {
   if (key === "accountChart" && getActivePage() === "account") {
-    updateResults();
-    updateAccuracy();
-    updateAverage10();
-    updateAverage100();
+    updateAccountChartButtons();
     accountHistory.update();
   }
   if (key === "fontFamily") setDefaultFontFamily(newValue);
diff --git a/frontend/src/ts/elements/account/result-filters.ts b/frontend/src/ts/elements/account/result-filters.ts
index fffecacb1e48..5039d86ff33c 100644
--- a/frontend/src/ts/elements/account/result-filters.ts
+++ b/frontend/src/ts/elements/account/result-filters.ts
@@ -166,7 +166,7 @@ export async function setFilterPreset(id: string): Promise<void> {
 
   // make current filter presest button active
   qsa(
-    `.pageAccount .group.presetFilterButtons .filterBtns .filterPresets .select-filter-preset[data-id=${id}]`,
+    `.pageAccount .group.presetFilterButtons .filterBtns .filterPresets .select-filter-preset[data-id="${id}"]`,
   ).addClass("active");
 }
 
@@ -528,19 +528,6 @@ for (const el of qsa(`
   `)) {
   el.onChild("click", "button", (e) => {
     const childTarget = e.childTarget as HTMLElement;
-    const group = (e.target as HTMLElement).parentElement?.getAttribute(
-      "group",
-    ) as ResultFiltersGroup | null;
-    if (group === null) {
-      throw new Error("Cannot find group of target.");
-    }
-
-    const filter = childTarget.getAttribute("filter") as ResultFiltersGroupItem<
-      typeof group
-    > | null;
-    if (filter === null) {
-      throw new Error("Cannot find filter of target.");
-    }
 
     if (childTarget.classList.contains("allFilters")) {
       Misc.typedKeys(getFilters()).forEach((group) => {
@@ -564,14 +551,30 @@ for (const el of qsa(`
           setAllFilters(group, false);
         }
       });
-    } else if ((e.target as HTMLElement).tagName === "BUTTON") {
-      if (e.shiftKey) {
-        setAllFilters(group, false);
-        filters[group][filter] =
-          true as ResultFilters[typeof group][typeof filter];
-      } else {
-        toggle(group, filter);
-        // filters[group][filter] = !filters[group][filter];
+    } else {
+      const group = (e.target as HTMLElement).parentElement?.getAttribute(
+        "group",
+      ) as ResultFiltersGroup | null;
+      if (group === null) {
+        throw new Error("Cannot find group of target.");
+      }
+
+      const filter = childTarget.getAttribute(
+        "filter",
+      ) as ResultFiltersGroupItem<typeof group> | null;
+      if (filter === null) {
+        throw new Error("Cannot find filter of target.");
+      }
+
+      if ((e.target as HTMLElement).tagName === "BUTTON") {
+        if (e.shiftKey) {
+          setAllFilters(group, false);
+          filters[group][filter] =
+            true as ResultFilters[typeof group][typeof filter];
+        } else {
+          toggle(group, filter);
+          // filters[group][filter] = !filters[group][filter];
+        }
       }
     }
     updateActive();