--- a/browser/extensions/formautofill/FormAutofillDoorhanger.jsm
+++ b/browser/extensions/formautofill/FormAutofillDoorhanger.jsm
@@ -42,16 +42,17 @@ const CONTENT = {
       id: "autofill-address-notification-icon",
       URL: "chrome://formautofill/content/formfill-anchor.svg",
       tooltiptext: GetStringFromName("openAutofillMessagePanel"),
     },
     mainAction: {
       label: GetStringFromName(changeAutofillOptsKey),
       accessKey: "C",
       callbackState: "open-pref",
+      disableHighlight: true,
     },
     options: {
       persistWhileVisible: true,
       popupIconURL: "chrome://formautofill/content/icon-address-save.svg",
       checkbox: {
         get checked() {
           return Services.prefs.getBoolPref("services.sync.engine.addresses");
         },
@@ -136,19 +137,19 @@ let FormAutofillDoorhanger = {
    * @returns {Array<Object>}
               Return the mainAction and secondary actions in an array for showing doorhanger
    */
   _createActions(mainActionParams, secondaryActionParams, resolve) {
     if (!mainActionParams) {
       return [null, null];
     }
 
-    let {label, accessKey, callbackState} = mainActionParams;
+    let {label, accessKey, disableHighlight, callbackState} = mainActionParams;
     let callback = resolve.bind(null, callbackState);
-    let mainAction = {label, accessKey, callback};
+    let mainAction = {label, accessKey, callback, disableHighlight};
 
     if (!secondaryActionParams) {
       return [mainAction, null];
     }
 
     let secondaryActions = [];
     for (let params of secondaryActionParams) {
       let cb = resolve.bind(null, params.callbackState);