diff --git a/src/main/base/store.ts b/src/main/base/store.ts
index c088ed2e..83f652bf 100644
--- a/src/main/base/store.ts
+++ b/src/main/base/store.ts
@@ -52,39 +52,39 @@ export class Store {
             },
             "keybindings": {
                 "search": [
-                    process.platform == "darwin" ? "Command" : "Control",
+                    "CommandOrControl",
                     "F"
                 ],
                 "listnow": [
-                    process.platform == "darwin" ? "Command" : "Control",
+                    "CommandOrControl",
                     "L"
                 ],
                 "browse": [
-                    process.platform == "darwin" ? "Command" : "Control",
+                    "CommandOrControl",
                     "B"
                 ],
                 "recentAdd": [
-                    process.platform == "darwin" ? "Command" : "Control",
+                    "CommandOrControl",
                     "G"
                 ],
                 "songs" : [
-                    process.platform == "darwin" ? "Command" : "Control",
+                    "CommandOrControl",
                     "J"
                 ],
                 "albums": [
-                    process.platform == "darwin" ? "Command" : "Control",
+                    "CommandOrControl",
                     "S"
                 ],
                 "artists": [
-                    process.platform == "darwin" ? "Command" : "Control",
+                    "CommandOrControl",
                     "D"
                 ],
                 "togglePrivateSession": [
-                    process.platform == "darwin" ? "Command" : "Control",
+                    "CommandOrControl",
                     "P"
                 ],
                 "webRemote": [
-                    process.platform == "darwin" ? "Command" : "Control",
+                    "CommandOrControl",
                     "W"
                 ],
                 "audioSettings": [
@@ -100,12 +100,12 @@ export class Store {
                     "C"
                 ],
                 "settings": [
-                    process.platform == "darwin" ? "Option" : "Shift",
+                    "CommandOrControl", // Who the hell uses a different key for this? Fucking Option?
                     "S"
                 ],
                 "openDeveloperTools": [
-                    process.platform == "darwin" ? "Command" : "Control",
-                    process.platform == "darwin" ? "Option" : "Shift",
+                    "CommandOrControl",
+                    "Shift",
                     "I"
                 ]
             },
diff --git a/src/renderer/views/pages/settings.ejs b/src/renderer/views/pages/settings.ejs
index e172325d..5637102e 100644
--- a/src/renderer/views/pages/settings.ejs
+++ b/src/renderer/views/pages/settings.ejs
@@ -1275,7 +1275,7 @@
                                 </div>
                                 <div class="md-option-segment md-option-segment_auto">
                                     <label>
-                                        <input type="checkbox" disabled a-v-model="app.cfg.connectUser.sync.settings"
+                                        <input type="checkbox" a-v-model="app.cfg.connectUser.sync.settings"
                                                @click="app.cfg.connectUser.sync.settings = !app.cfg.connectUser.sync.settings"
                                                switch/>
                                     </label>