diff --git a/src/plugins/accountPanelServerProfile/index.tsx b/src/plugins/accountPanelServerProfile/index.tsx
index 8d90ff5eb..6737dc314 100644
--- a/src/plugins/accountPanelServerProfile/index.tsx
+++ b/src/plugins/accountPanelServerProfile/index.tsx
@@ -87,7 +87,7 @@ export default definePlugin({
                     replace: "$&$self.onPopoutClose();"
                 },
                 {
-                    match: /(?:#{intl::5fWB8U::raw}|#{intl::SET_STATUS})\)(?<=ref:(\i),style:.+?)/,
+                    match: /ref:(\i),style:\i(?=.{0,250}#{intl::5fWB8U::raw})/,
                     replace: "$&,onContextMenu:($self.grabRef($1),$self.openAccountPanelContextMenu)"
                 }
             ]
diff --git a/src/plugins/experiments/index.tsx b/src/plugins/experiments/index.tsx
index 5c865d6b5..2ebb81f2d 100644
--- a/src/plugins/experiments/index.tsx
+++ b/src/plugins/experiments/index.tsx
@@ -91,7 +91,7 @@ export default definePlugin({
         {
             find: "useCanFavoriteChannel",
             replacement: {
-                match: /(?<=\i\.id\)\),\i=)\i\.isThread\(\)/,
+                match: /(?<=isFavorite\(\i\.id\).{0,5})\i\.isThread\(\)/,
                 replace: "false",
             }
         },