diff --git a/keepassxc-browser/options/options.js b/keepassxc-browser/options/options.js
index 19e5b80..3009696 100644
--- a/keepassxc-browser/options/options.js
+++ b/keepassxc-browser/options/options.js
@@ -74,6 +74,8 @@ options.initGeneralSettings = async function() {
         } else if (name === 'autoReconnect') {
             const message = updated.autoReconnect ? 'enable_automatic_reconnect' : 'disable_automatic_reconnect';
             browser.runtime.sendMessage({ action: message });
+        } else if (name === 'passkeys') {
+            $('#passkeysFallback').disabled = !isChecked;
         } else if (name === 'useMonochromeToolbarIcon') {
             browser.runtime.sendMessage({ action: 'update_popup' });
         }
@@ -230,6 +232,8 @@ options.initGeneralSettings = async function() {
         await options.saveSettings();
     });
 
+    $('#passkeysFallback').disabled = options.settings['passkeys'] === false;
+
     let temporarySettings;
     const dialogImportSettingsModal = new bootstrap.Modal('#dialogImportSettings',
         { keyboard: true, focus: false, backdrop: true });