diff --git a/android/java/proguard.flags b/android/java/proguard.flags
index 697512f8e27..1777b229ee6 100644
--- a/android/java/proguard.flags
+++ b/android/java/proguard.flags
@@ -53,5 +53,6 @@
 -keep,allowobfuscation,allowshrinking class com.google.gson.reflect.TypeToken
 
 -keep class org.chromium.chrome.browser.tasks.tab_groups.TabGroupModelFilter {
-    *** getParentId(...);
+    *** getParentIds(...);
+    *** getOrCreateTabGroupId(...);
 }
diff --git a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java
index 9c175f56df9..527d20e55d7 100644
--- a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java
+++ b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java
@@ -13,6 +13,7 @@ import android.content.res.Resources;
 import android.os.Bundle;
 import android.os.Handler;
 import android.util.AttributeSet;
+import android.util.Pair;
 import android.view.ActionMode;
 import android.view.View;
 import android.view.ViewGroup;
@@ -29,6 +30,7 @@ import org.junit.runner.RunWith;
 
 import org.chromium.base.Callback;
 import org.chromium.base.FeatureMap;
+import org.chromium.base.Token;
 import org.chromium.base.jank_tracker.JankTracker;
 import org.chromium.base.shared_preferences.PreferenceKeyRegistry;
 import org.chromium.base.shared_preferences.SharedPreferencesManager;
@@ -695,11 +697,28 @@ public class BytecodeTest {
         Assert.assertTrue(methodExists("org/chromium/components/browser_ui/site_settings/Website",
                 "setContentSetting", true, void.class, BrowserContextHandle.class, int.class,
                 int.class));
-        Assert.assertTrue(methodExists("org/chromium/chrome/browser/tab/TabHelpers",
-                "initTabHelpers", true, void.class, Tab.class, Tab.class));
         Assert.assertTrue(
-                methodExists("org/chromium/chrome/browser/tasks/tab_groups/TabGroupModelFilter",
-                        "getParentId", true, int.class, Tab.class));
+                methodExists(
+                        "org/chromium/chrome/browser/tab/TabHelpers",
+                        "initTabHelpers",
+                        true,
+                        void.class,
+                        Tab.class,
+                        Tab.class));
+        Assert.assertTrue(
+                methodExists(
+                        "org/chromium/chrome/browser/tasks/tab_groups/TabGroupModelFilter",
+                        "getParentIds",
+                        true,
+                        Pair.class,
+                        Tab.class));
+        Assert.assertTrue(
+                methodExists(
+                        "org/chromium/chrome/browser/tasks/tab_groups/TabGroupModelFilter",
+                        "getOrCreateTabGroupId",
+                        true,
+                        Token.class,
+                        Tab.class));
 
         Assert.assertTrue(
                 methodExists(
@@ -873,7 +892,8 @@ public class BytecodeTest {
                         Supplier.class,
                         HomeSurfaceTracker.class,
                         ObservableSupplier.class,
-                        ObservableSupplier.class));
+                        ObservableSupplier.class,
+                        OneshotSupplier.class));
         Assert.assertTrue(
                 constructorsMatch(
                         "org/chromium/chrome/browser/toolbar/top/TopToolbarCoordinator",
diff --git a/browser/tab_group/java/src/org/chromium/chrome/browser/tasks/tab_groups/BraveTabGroupModelFilter.java b/browser/tab_group/java/src/org/chromium/chrome/browser/tasks/tab_groups/BraveTabGroupModelFilter.java
index f2970172b35..5d94651dc4b 100644
--- a/browser/tab_group/java/src/org/chromium/chrome/browser/tasks/tab_groups/BraveTabGroupModelFilter.java
+++ b/browser/tab_group/java/src/org/chromium/chrome/browser/tasks/tab_groups/BraveTabGroupModelFilter.java
@@ -1,14 +1,16 @@
-/**
- * Copyright (c) 2023 The Brave Authors. All rights reserved.
+/* Copyright (c) 2023 The Brave Authors. All rights reserved.
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
+ * You can obtain one at https://mozilla.org/MPL/2.0/. */
 package org.chromium.chrome.browser.tasks.tab_groups;
 
+import android.util.Pair;
+
+import androidx.annotation.NonNull;
+
 import org.chromium.base.BravePreferenceKeys;
 import org.chromium.base.BraveReflectionUtil;
+import org.chromium.base.Token;
 import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tab.TabLaunchType;
@@ -30,10 +32,8 @@ public abstract class BraveTabGroupModelFilter extends TabModelFilter {
         super(tabModel);
     }
 
-    /**
-     * Call from {@link TabGroupModelFilter} will be redirected here via bytrcode.
-     */
-    public int getParentId(Tab tab) {
+    /** Call from {@link TabGroupModelFilter} will be redirected here via bytrcode. */
+    public Pair<Integer, Token> getParentIds(Tab tab) {
         if (linkClicked(tab.getLaunchType())
                 && ChromeSharedPreferences.getInstance()
                         .readBoolean(BravePreferenceKeys.BRAVE_TAB_GROUPS_ENABLED, true)
@@ -41,12 +41,13 @@ public abstract class BraveTabGroupModelFilter extends TabModelFilter {
                 && !mIsResetting) {
             Tab parentTab = TabModelUtils.getTabById(getTabModel(), tab.getParentId());
             if (parentTab != null) {
-                return parentTab.getRootId();
+                return new Pair<>(parentTab.getRootId(), getOrCreateTabGroupId(parentTab));
             }
         }
         // Otherwise just call parent.
-        return (int) BraveReflectionUtil.InvokeMethod(
-                TabGroupModelFilter.class, this, "getParentId", Tab.class, tab);
+        return (Pair<Integer, Token>)
+                BraveReflectionUtil.InvokeMethod(
+                        TabGroupModelFilter.class, this, "getParentIds", Tab.class, tab);
     }
 
     /**
@@ -55,4 +56,10 @@ public abstract class BraveTabGroupModelFilter extends TabModelFilter {
     private boolean linkClicked(@TabLaunchType int type) {
         return type == TabLaunchType.FROM_LINK || type == TabLaunchType.FROM_LONGPRESS_FOREGROUND;
     }
+
+    private static Token getOrCreateTabGroupId(@NonNull Tab tab) {
+        return (Token)
+                BraveReflectionUtil.InvokeMethod(
+                        TabGroupModelFilter.class, null, "getOrCreateTabGroupId", Tab.class, tab);
+    }
 }
diff --git a/build/android/bytecode/java/org/brave/bytecode/BraveTabGroupModelFilterClassAdapter.java b/build/android/bytecode/java/org/brave/bytecode/BraveTabGroupModelFilterClassAdapter.java
index b000a5d283c..bf62137eabb 100644
--- a/build/android/bytecode/java/org/brave/bytecode/BraveTabGroupModelFilterClassAdapter.java
+++ b/build/android/bytecode/java/org/brave/bytecode/BraveTabGroupModelFilterClassAdapter.java
@@ -21,6 +21,6 @@ public class BraveTabGroupModelFilterClassAdapter extends BraveClassVisitor {
         deleteField(sTabGroupModelFilterClassName, "mIsResetting");
 
         changeMethodOwner(
-                sTabGroupModelFilterClassName, "getParentId", sBraveTabGroupModelFilterClassName);
+                sTabGroupModelFilterClassName, "getParentIds", sBraveTabGroupModelFilterClassName);
     }
 }