diff --git a/__tests__/boot.ts b/__tests__/boot.ts
index c5910cf572..fae16a969e 100644
--- a/__tests__/boot.ts
+++ b/__tests__/boot.ts
@@ -1365,6 +1365,7 @@ describe('boot misc', () => {
         sidebarBookmarksExpanded: true,
         clickbaitShieldEnabled: true,
         noAiFeedEnabled: false,
+        browsingContextEnabled: false,
       },
     });
   });
diff --git a/src/common/flags.ts b/src/common/flags.ts
index 2d31cf94bb..4a8171079a 100644
--- a/src/common/flags.ts
+++ b/src/common/flags.ts
@@ -9,6 +9,7 @@ export const transformSettingFlags = ({ flags }: Pick<Settings, 'flags'>) => {
     sidebarBookmarksExpanded: flags?.sidebarBookmarksExpanded ?? true,
     clickbaitShieldEnabled: flags?.clickbaitShieldEnabled ?? true,
     noAiFeedEnabled: flags?.noAiFeedEnabled ?? false,
+    browsingContextEnabled: flags?.browsingContextEnabled ?? false,
     ...flags,
   };
 };
diff --git a/src/entity/Settings.ts b/src/entity/Settings.ts
index c13e107e6e..d2848e8e38 100644
--- a/src/entity/Settings.ts
+++ b/src/entity/Settings.ts
@@ -34,6 +34,7 @@ export type SettingsFlags = Partial<{
   sidebarBookmarksExpanded: boolean;
   clickbaitShieldEnabled: boolean;
   noAiFeedEnabled: boolean;
+  browsingContextEnabled: boolean;
   prompt: object;
   timezoneMismatchIgnore: string;
   lastPrompt: string;
@@ -49,6 +50,7 @@ export type SettingsFlagsPublic = Pick<
   | 'sidebarBookmarksExpanded'
   | 'clickbaitShieldEnabled'
   | 'noAiFeedEnabled'
+  | 'browsingContextEnabled'
   | 'prompt'
   | 'timezoneMismatchIgnore'
   | 'lastPrompt'
diff --git a/src/schema/settings.ts b/src/schema/settings.ts
index 00738a0a7c..54b2da9dad 100644
--- a/src/schema/settings.ts
+++ b/src/schema/settings.ts
@@ -73,6 +73,7 @@ export const typeDefs = /* GraphQL */ `
     sidebarBookmarksExpanded: Boolean
     clickbaitShieldEnabled: Boolean
     noAiFeedEnabled: Boolean
+    browsingContextEnabled: Boolean
     timezoneMismatchIgnore: String
     lastPrompt: String
     defaultWriteTab: DefaultWriteTab
@@ -86,6 +87,7 @@ export const typeDefs = /* GraphQL */ `
     sidebarBookmarksExpanded: Boolean
     clickbaitShieldEnabled: Boolean
     noAiFeedEnabled: Boolean
+    browsingContextEnabled: Boolean
     prompt: JSONObject
     timezoneMismatchIgnore: String
     lastPrompt: String