diff --git a/PATCH_NOTES.md b/PATCH_NOTES.md
index 34f3fc6..9e57f29 100644
--- a/PATCH_NOTES.md
+++ b/PATCH_NOTES.md
@@ -1 +1 @@
-- Bug fix: Macros disappear from Custom Hotbar
+- Always register all settings, but toggle visibility using `config`
diff --git a/README.md b/README.md
index b9f308b..c34b84d 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 <h1 align="center">Token Hotbar</h1>
 <p align="center">
-<img src="https://github.com/janssen-io/foundry-token-hotbar/workflows/TokenHotbar%20CI/badge.svg" alt="build status" /> <img src="https://img.shields.io/github/downloads-pre/janssen-io/foundry-token-hotbar/v4.0.3/TokenHotbar.zip?label=v4.0.3" alt="v4.0.3 downloads" />
+<img src="https://github.com/janssen-io/foundry-token-hotbar/workflows/TokenHotbar%20CI/badge.svg" alt="build status" /> <img src="https://img.shields.io/github/downloads-pre/janssen-io/foundry-token-hotbar/v4.0.4/TokenHotbar.zip?label=v4.0.4" alt="v4.0.4 downloads" />
 </p>
 
 Using this Foundry VTT module, you can assign one of the hotbar pages to remember macros per token.
diff --git a/src/main.ts b/src/main.ts
index b647283..4ec805e 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -55,16 +55,15 @@ Hooks.on('init', () => {
         game.settings.set(CONSTANTS.module.name, Settings.keys.useCustomHotbar, false);
     }
 
-    if (!game.settings.get(CONSTANTS.module.name, Settings.keys.useCustomHotbar))
-        game.settings.register(CONSTANTS.module.name, Settings.keys.hotbarPage, {
-            name: 'TokenHotbar.settings.page.name',
-            hint: 'TokenHotbar.settings.page.hint',
-            scope: 'world',
-            config: true,
-            default: 5,
-            type: Number,
-            range: { min: 1, max: 5, step: 1 }
-        });
+    game.settings.register(CONSTANTS.module.name, Settings.keys.hotbarPage, {
+        name: 'TokenHotbar.settings.page.name',
+        hint: 'TokenHotbar.settings.page.hint',
+        scope: 'world',
+        config: !game.settings.get(CONSTANTS.module.name, Settings.keys.useCustomHotbar),
+        default: 5,
+        type: Number,
+        range: { min: 1, max: 5, step: 1 }
+    });
 
     game.settings.register(CONSTANTS.module.name, Settings.keys.linkToLinkedActor, {
         name: 'TokenHotbar.settings.linkToActor.name',