diff --git a/devtools/client/accessibility/accessibility-startup.js b/devtools/client/accessibility/accessibility-startup.js
index 8dc7164b5f87..28d99e0b2ef5 100644
--- a/devtools/client/accessibility/accessibility-startup.js
+++ b/devtools/client/accessibility/accessibility-startup.js
@@ -96,6 +96,12 @@ class AccessibilityStartup {
    * accessibility service is initialized or shutdown.
    */
   async _updateToolHighlight() {
+    // Only update the tab highlighted state when the panel can be
+    // enabled/disabled manually.
+    if (this.accessibilityProxy.supports.autoInit) {
+      return;
+    }
+
     const isHighlighted = await this.toolbox.isToolHighlighted("accessibility");
     if (this.accessibilityProxy.enabled && !isHighlighted) {
       this.toolbox.highlightTool("accessibility");