diff --git a/app/scripts/const/links.js b/app/scripts/const/links.js
index d74b4758..696df3ad 100644
--- a/app/scripts/const/links.js
+++ b/app/scripts/const/links.js
@@ -23,17 +23,14 @@ const Links = {
     HaveIBeenPwnedPrivacy: 'https://haveibeenpwned.com/Passwords',
     ExtensionHelpForOtherBrowsers:
         'https://github.com/keeweb/keeweb/wiki/Browser-AutoFill#other-browsers',
+    ExtensionHelpForKPXC:
+        'https://github.com/keeweb/keeweb/wiki/Browser-AutoFill#keepassxc-browser',
     KWCForChrome:
         'https://chrome.google.com/webstore/detail/keeweb-connect/pikpfmjfkekaeinceagbebpfkmkdlcjk',
     KWCForFirefox: 'https://addons.mozilla.org/firefox/addon/keeweb-connect/',
     KWCForEdge:
         'https://microsoftedge.microsoft.com/addons/detail/keewebconnect/nmggpehkjmeaeocmaijenpejbepckinm',
-    KWCForSafari: 'https://apps.apple.com/app/keeweb-connect/id1565748094',
-    KPXCForChrome:
-        'https://chrome.google.com/webstore/detail/keepassxc-browser/oboonakemofpalcgghocfoadofidjkkk',
-    KPXCForFirefox: 'https://addons.mozilla.org/firefox/addon/keepassxc-browser/',
-    KPXCForEdge:
-        'https://microsoftedge.microsoft.com/addons/detail/keepassxcbrowser/pdffhmdngciaglkoonimfcmckehcpafo'
+    KWCForSafari: 'https://apps.apple.com/app/keeweb-connect/id1565748094'
 };
 
 export { Links };
diff --git a/app/scripts/views/settings/settings-browser-view.js b/app/scripts/views/settings/settings-browser-view.js
index 29c6cb80..d747dcfb 100644
--- a/app/scripts/views/settings/settings-browser-view.js
+++ b/app/scripts/views/settings/settings-browser-view.js
@@ -72,6 +72,9 @@ class SettingsBrowserView extends View {
                     enabled: !!AppSettingsModel[`extensionEnabled${ext.alias}${browser}`],
                     installUrl: Links[`${ext.alias}For${browser}`]
                 };
+                if (ext.alias === 'KPXC') {
+                    ext.manualUrl = Links.ExtensionHelpForKPXC;
+                }
                 if (!ext.installUrl) {
                     if (browser === 'Other') {
                         ext.helpUrl = Links.ExtensionHelpForOtherBrowsers;
diff --git a/app/templates/settings/settings-browser.hbs b/app/templates/settings/settings-browser.hbs
index 618c8acb..6984aad1 100644
--- a/app/templates/settings/settings-browser.hbs
+++ b/app/templates/settings/settings-browser.hbs
@@ -24,33 +24,42 @@
                         <td>{{perBrowser.browserName}}</td>
                         {{#each perBrowser.extensions as |setting|}}
                             <td>
-                                {{#if setting.supported}}
-                                    <input type="checkbox"
-                                           class="check-enable-for-browser"
-                                           {{#if setting.enabled}}checked{{/if}}
-                                           id="check-enable-{{setting.alias}}-for-{{perBrowser.browser}}"
-                                           data-browser="{{perBrowser.browser}}"
-                                           data-extension="{{setting.alias}}" />
-                                    <label for="check-enable-{{setting.alias}}-for-{{perBrowser.browser}}"></label>
+                                {{#if setting.manualUrl}}
+                                    <a href="{{setting.manualUrl}}" target="_blank" rel="noreferrer"
+                                       class="settings__browser-extension-link icon-link"
+                                       title="{{res 'setBrowserExtensionHelp'}}"
+                                    >
+                                        <i class="fa fa-info-circle"></i>
+                                    </a>
                                 {{else}}
-                                    <i class="fa fa-times muted-color" title="{{res 'setBrowserExtensionNotSupported'}}"></i>
-                                {{/if}}
-                                {{#if setting.enabled}}
-                                    {{#if setting.helpUrl}}
-                                        <a href="{{setting.helpUrl}}" target="_blank" rel="noreferrer"
-                                           class="settings__browser-extension-link icon-link"
-                                           title="{{res 'setBrowserExtensionHelp'}}"
-                                        >
-                                            <i class="fa fa-info-circle"></i>
-                                        </a>
+                                    {{#if setting.supported}}
+                                        <input type="checkbox"
+                                               class="check-enable-for-browser"
+                                               {{#if setting.enabled}}checked{{/if}}
+                                               id="check-enable-{{setting.alias}}-for-{{perBrowser.browser}}"
+                                               data-browser="{{perBrowser.browser}}"
+                                               data-extension="{{setting.alias}}" />
+                                        <label for="check-enable-{{setting.alias}}-for-{{perBrowser.browser}}"></label>
+                                    {{else}}
+                                        <i class="fa fa-times muted-color" title="{{res 'setBrowserExtensionNotSupported'}}"></i>
                                     {{/if}}
-                                    {{#if setting.installUrl}}
-                                        <a href="{{setting.installUrl}}" target="_blank" rel="noreferrer"
-                                           class="settings__browser-extension-link icon-link"
-                                           title="{{res 'setBrowserExtensionInstall'}}"
-                                        >
-                                            <i class="fa fa-download"></i>
-                                        </a>
+                                    {{#if setting.enabled}}
+                                        {{#if setting.helpUrl}}
+                                            <a href="{{setting.helpUrl}}" target="_blank" rel="noreferrer"
+                                               class="settings__browser-extension-link icon-link"
+                                               title="{{res 'setBrowserExtensionHelp'}}"
+                                            >
+                                                <i class="fa fa-info-circle"></i>
+                                            </a>
+                                        {{/if}}
+                                        {{#if setting.installUrl}}
+                                            <a href="{{setting.installUrl}}" target="_blank" rel="noreferrer"
+                                               class="settings__browser-extension-link icon-link"
+                                               title="{{res 'setBrowserExtensionInstall'}}"
+                                            >
+                                                <i class="fa fa-download"></i>
+                                            </a>
+                                        {{/if}}
                                     {{/if}}
                                 {{/if}}
                             </td>
diff --git a/release-notes.md b/release-notes.md
index ab569e4e..58b4fe17 100644
--- a/release-notes.md
+++ b/release-notes.md
@@ -1,6 +1,7 @@
 Release notes
 -------------
 ##### v1.18.7 (2021-07-18)
+`!` disabled automatic installation of KeePassXC-Browser extension  
 `+` added an option to diagnose YubiKey code listing issues  
 `-` fix #1845: fixed a visible crash on socket write error