diff --git a/src/zen/boosts/ZenBoostsEditor.mjs b/src/zen/boosts/ZenBoostsEditor.mjs
index d24152d24..ffc794918 100644
--- a/src/zen/boosts/ZenBoostsEditor.mjs
+++ b/src/zen/boosts/ZenBoostsEditor.mjs
@@ -461,9 +461,12 @@ ${cssSelector} {
     const actor =
       linkedBrowser.browsingContext.currentWindowGlobal.getActor("ZenBoosts");
     const zapButton = this.doc.getElementById("zen-boost-zap");
+    
     const zapEnabled = await actor.sendQuery("ZenBoost:ZapModeEnabled");
+    // Checks if there are any zaps
+    const zapAny = await actor.sendQuery("ZenBoost:ZapModeAny");
 
-    zapButton.setAttribute("enabled", zapEnabled ? "true" : "false");
+    zapButton.setAttribute("enabled", (zapEnabled || zapAny) ? "true" : "false");
   }
 
   async onUpdatePickerButtonVisual() {
@@ -1295,6 +1298,7 @@ ${cssSelector} {
     this.updateDot();
     this.updateCircleRadius();
     this.onUpdateZapValue();
+    this.onUpdateZapButtonVisual();
   }
 
   /**
diff --git a/src/zen/boosts/actors/ZenBoostsChild.sys.mjs b/src/zen/boosts/actors/ZenBoostsChild.sys.mjs
index 855d80ce4..a40acd325 100644
--- a/src/zen/boosts/actors/ZenBoostsChild.sys.mjs
+++ b/src/zen/boosts/actors/ZenBoostsChild.sys.mjs
@@ -262,6 +262,9 @@ export class ZenBoostsChild extends JSWindowActorChild {
         break;
       case "ZenBoost:ZapModeEnabled":
         return this.#currentState === ZenBoostsChild.STATES.ZAP;
+      case "ZenBoost:ZapModeAny":
+        const { boostData } = (await this.getWebsiteBoost()).boostEntry;
+        return boostData.zapSelectors.length > 0;
       case "ZenBoost:SelectorPickerModeEnabled":
         return this.#currentState === ZenBoostsChild.STATES.PICKER;
       case "ZenBoost:OpenInspector":
diff --git a/src/zen/boosts/zen-boosts.css b/src/zen/boosts/zen-boosts.css
index 805822042..33ab7a011 100644
--- a/src/zen/boosts/zen-boosts.css
+++ b/src/zen/boosts/zen-boosts.css
@@ -534,11 +534,11 @@ body {
 }
 
 .zen-boost-font-button-active {
-  background-color: #5454572f !important;
+  background-color: #5454572f;
 }
 
 .zen-boost-font-button-active:hover {
-  background-color: #5b5b5c28 !important;
+  background-color: #5b5b5c28;
 }
 
 @property --mod-button-c1 {