diff --git a/public/js/script.js b/public/js/script.js
index 035c64f41..b3ce91554 100644
--- a/public/js/script.js
+++ b/public/js/script.js
@@ -170,9 +170,9 @@ function activateFunbox(funbox, mode) {
       changeKeymapMode("next");
       settingsGroups.keymapMode.updateButton();
       changeLayout("qwerty");
-      setActiveLayoutButton();
+      settingsGroups.layout.updateButton();
       changeKeymapLayout("qwerty");
-      setActiveKeymapLayoutButton();
+      settingsGroups.keymapLayout.updateButton();
       restartTest();
     }
     activeFunBox = funbox;
@@ -1932,7 +1932,7 @@ function startTest() {
         changeLayout(layouts[index]);
         changeKeymapLayout(layouts[index]);
         updateHighlightedKeymapKey();
-        setActiveLayoutButton();
+        settingsGroups.layout.updateButton();
       }
 
       // console.timeEnd("livewpm");
@@ -2073,9 +2073,9 @@ function restartTest(withSameWordset = false) {
 
       if (activeFunBox === "layoutfluid") {
         changeLayout("qwerty");
-        setActiveLayoutButton();
+        settingsGroups.layout.updateButton();
         changeKeymapLayout("qwerty");
-        setActiveKeymapLayoutButton();
+        settingsGroups.keymapLayout.updateButton();
         updateHighlightedKeymapKey();
       }