diff --git a/packages/browser-extension/src/manifest.json b/packages/browser-extension/src/manifest.json
index e29441c..aabb76c 100644
--- a/packages/browser-extension/src/manifest.json
+++ b/packages/browser-extension/src/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "Cookie Dialog Monster",
-  "version": "8.0.3",
+  "version": "8.0.4",
   "default_locale": "en",
   "description": "__MSG_appDesc__",
   "icons": {
@@ -11,6 +11,7 @@
   },
   "action": {
     "default_icon": "assets/icons/off.png",
+    "default_popup": "popup.html",
     "default_title": "Cookie Dialog Monster"
   },
   "options_page": "options.html",
diff --git a/packages/browser-extension/src/scripts/background.js b/packages/browser-extension/src/scripts/background.js
index d02c509..3a9c782 100644
--- a/packages/browser-extension/src/scripts/background.js
+++ b/packages/browser-extension/src/scripts/background.js
@@ -302,16 +302,6 @@ browser.runtime.onMessage.addListener((message, sender, callback) => {
         return true;
       }
       break;
-    case 'ENABLE_POPUP':
-      if (isPage && tabId !== undefined) {
-        browser.action.setPopup({ popup: '/popup.html', tabId }, suppressLastError);
-      }
-      break;
-    case 'ENABLE_REPORT':
-      if (isPage && tabId !== undefined) {
-        browser.contextMenus.update(reportMenuItemId, { enabled: true });
-      }
-      break;
     case 'GET_DATA':
       getData().then(callback);
       return true;
@@ -381,7 +371,6 @@ browser.runtime.onInstalled.addListener((details) => {
     {
       contexts: ['all'],
       documentUrlPatterns,
-      enabled: false,
       id: reportMenuItemId,
       parentId: extensionMenuItemId,
       title: browser.i18n.getMessage('contextMenu_reportOption'),
diff --git a/packages/browser-extension/src/scripts/content.js b/packages/browser-extension/src/scripts/content.js
index 60960c5..92c37ab 100644
--- a/packages/browser-extension/src/scripts/content.js
+++ b/packages/browser-extension/src/scripts/content.js
@@ -469,8 +469,6 @@ async function setUp(params = {}) {
   }
 
   state = await dispatch({ hostname, type: 'GET_STATE' });
-  dispatch({ type: 'ENABLE_POPUP' });
-  dispatch({ type: 'ENABLE_REPORT' });
 
   if (state.on) {
     browser.runtime.onMessage.addListener(handleRuntimeMessage);