diff --git a/js/popup.js b/js/popup.js
index a35beb2..d072bec 100644
--- a/js/popup.js
+++ b/js/popup.js
@@ -139,7 +139,7 @@ function selectSet(id) {
                 $("p.yt").first().show();
             }
 
-            if (blocksetTimesElapsed[id] >= blocksetDatas[id].timeAllowed) {
+            if (blocksetTimesElapsed[id] >= blocksetDatas[id].timeAllowed && blocksetDatas[id].timeAllowed != 0 && !blocksetDatas[id].annoyMode) {
                 $("a[id^='wl']").attr("class", "disabled");
             }
             else {
diff --git a/manifest.json b/manifest.json
index abcb4b4..15f033c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,7 +3,7 @@
   "name": "Dawdle block",
   "short_name": "Dawdle block",
   "description": "Put time limits on unproductive sites.",
-  "version": "1.1.1",
+  "version": "1.1.2",
 
   "options_ui": {
     "page": "options.html",
diff --git a/patchNotes.txt b/patchNotes.txt
index 37887f7..dc4dfd0 100644
--- a/patchNotes.txt
+++ b/patchNotes.txt
@@ -1,3 +1,6 @@
+Version 1.1.2
+- Popup buttons are now not disabled when annoy mode is on (same behaviour as options page)
+
 Version 1.1.1
 - Annoy mode banner font more reliably pretty
 - Firefox specific css optimization