diff --git a/src/renderer/src/appStore.ts b/src/renderer/src/appStore.ts
index 51470cc..5632605 100644
--- a/src/renderer/src/appStore.ts
+++ b/src/renderer/src/appStore.ts
@@ -46,7 +46,8 @@ export const useAppStore = defineStore('app', {
       },
       previewDeviceModel: localStorage.getItem('previewDeviceModel') || 'nanoOne',
       profileManagerDragging: false,
-      showProfileConfig: false
+      showProfileConfig: false,
+      selectOnInput: false
     }
   },
   getters: {
@@ -76,6 +77,9 @@ export const useAppStore = defineStore('app', {
     setShowProfileConfig(show) {
       show = false // TODO: Remove this / replace with actual logic
       this.showProfileConfig = show
+    },
+    toggleSelectOnInput() {
+      this.selectOnInput = !this.selectOnInput
     }
   }
 })
diff --git a/src/renderer/src/components/navbar/Navbar.vue b/src/renderer/src/components/navbar/Navbar.vue
index c56f9da..55f6330 100644
--- a/src/renderer/src/components/navbar/Navbar.vue
+++ b/src/renderer/src/components/navbar/Navbar.vue
@@ -80,6 +80,11 @@
               <p>{{ previewDeviceNames[appStore.previewDeviceModel || 'nanoOne'] }}</p>
               <MenubarShortcut>⌘S</MenubarShortcut>
             </MenubarItem>
+            <MenubarItem class="flex justify-between" @click="appStore.toggleSelectOnInput">
+              <p>Auto Select:&nbsp;</p>
+              <p>{{ appStore.selectOnInput ? 'On' : 'Off' }}</p>
+              <MenubarShortcut>⌘K</MenubarShortcut>
+            </MenubarItem>
             <MenubarSeparator />
             <MenubarItem
               >{{ $t('navbar.device.export') }}
diff --git a/src/renderer/src/deviceStore.ts b/src/renderer/src/deviceStore.ts
index ab3f22c..52c8872 100644
--- a/src/renderer/src/deviceStore.ts
+++ b/src/renderer/src/deviceStore.ts
@@ -703,12 +703,12 @@ export const initializeDevices = () => {
       }
       if (update.p !== undefined) {
         deviceStore.setPosition(update.p)
-        appStore.selectConfigFeature('knob')
+        if (appStore.selectOnInput) appStore.selectConfigFeature('knob')
       }
       if (update.kd !== undefined) {
         const keyLabel = deviceStore.keyLabels[update.kd]
         deviceStore.keyStates[keyLabel] = true
-        appStore.selectKey(keyLabel)
+        if (appStore.selectOnInput) appStore.selectKey(keyLabel)
       }
       if (update.ku !== undefined) {
         deviceStore.keyStates[deviceStore.keyLabels[update.ku]] = false