diff --git a/packages/maskbook/src/manifest.json b/packages/maskbook/src/manifest.json
index 8f2330c05e23..05fdd3765b6b 100644
--- a/packages/maskbook/src/manifest.json
+++ b/packages/maskbook/src/manifest.json
@@ -7,7 +7,7 @@
     "background": { "page": "background.html" },
     "options_ui": { "page": "index.html", "open_in_tab": true },
     "icons": { "16": "16x16.png", "48": "48x48.png", "128": "128x128.png", "256": "256x256.png" },
-    "browser_action": { "default_popup": "browser-action.html" },
+    "browser_action": { "default_popup": "popups.html" },
     "homepage_url": "https://mask.io",
     "description": "The portal to the new & open Internet. Send encrypted message and decentralized Apps right on top of social networks.",
     "web_accessible_resources": ["js/*", "*.png"],
diff --git a/packages/maskbook/src/social-network-adaptor/browser-action/index.ts b/packages/maskbook/src/social-network-adaptor/browser-action/index.ts
index f6e7d7aaa92f..6d6b6bdc61f7 100644
--- a/packages/maskbook/src/social-network-adaptor/browser-action/index.ts
+++ b/packages/maskbook/src/social-network-adaptor/browser-action/index.ts
@@ -6,8 +6,6 @@ const base: SocialNetwork.Base = {
     networkIdentifier: 'localhost',
     declarativePermissions: { origins: [] },
     shouldActivate(location) {
-        //TODO: replace this line to Env assert
-        if (location.pathname === '/popups.html') return true
         return isEnvironment(Environment.ManifestAction)
     },
 }
diff --git a/packages/maskbook/src/utils/flags.ts b/packages/maskbook/src/utils/flags.ts
index 646b6641f701..07177dfeeb34 100644
--- a/packages/maskbook/src/utils/flags.ts
+++ b/packages/maskbook/src/utils/flags.ts
@@ -46,7 +46,7 @@ export const Flags = {
     plugin_switch_enabled: betaOrInsiderOnly,
     //#endregion
 
-    EIP1559_enabled: betaOrInsiderOnly,
+    EIP1559_enabled: true,
 
     bsc_enabled: true,
     polygon_enabled: true,