diff --git a/src/components/Controls.tsx b/src/components/Controls.tsx
index 2f8e882..6a48363 100644
--- a/src/components/Controls.tsx
+++ b/src/components/Controls.tsx
@@ -26,10 +26,12 @@ export default () => {
     }
   }
 
-  createEffect(() => {
-    selectChapter(store.visibleChapter());
+  createEffect((prev) => {
+    if (prev !== store.visibleChapter()) {
+      selectChapter(store.visibleChapter());
+    }
     return store.visibleChapter();
-  }, 'home');
+  });
 
   return (
     <>
@@ -47,7 +49,9 @@ export default () => {
         <div class={styles.controlsWrapper}>
           <For each={controls}>{(control) =>
             <div 
-              onClick={() => selectChapter(control.name)}
+              onClick={() => {
+                selectChapter(control.name)
+              }}
               class={styles.control}
             >
               <img