diff --git a/android/java/org/chromium/chrome/browser/DeprecateBAPModalDialogFragment.java b/android/java/org/chromium/chrome/browser/DeprecateBAPModalDialogFragment.java
index 6a193cea0450..ded1f01f2b91 100644
--- a/android/java/org/chromium/chrome/browser/DeprecateBAPModalDialogFragment.java
+++ b/android/java/org/chromium/chrome/browser/DeprecateBAPModalDialogFragment.java
@@ -8,12 +8,14 @@
 package org.chromium.chrome.browser;
 
 import android.content.DialogInterface;
+import android.content.pm.ActivityInfo;
 import android.content.res.Configuration;
 import android.os.Bundle;
 import android.util.DisplayMetrics;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.Window;
 import android.view.WindowManager;
 import android.widget.Button;
 import android.widget.LinearLayout;
@@ -50,6 +52,19 @@ public boolean onKey(android.content.DialogInterface dialog, int keyCode,
         setDialogParams();
     }
 
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setStyle(STYLE_NO_TITLE, 0);
+        getActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+    }
+
+    @Override
+    public void onDestroyView() {
+        getActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
+        super.onDestroyView();
+    }
+
     @Override
     public View onCreateView(
             LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
diff --git a/android/java/org/chromium/chrome/browser/app/BraveActivity.java b/android/java/org/chromium/chrome/browser/app/BraveActivity.java
index 6ca9db079ddd..80d0194c3b48 100644
--- a/android/java/org/chromium/chrome/browser/app/BraveActivity.java
+++ b/android/java/org/chromium/chrome/browser/app/BraveActivity.java
@@ -708,6 +708,15 @@ public boolean isRewardsPanelOpened() {
         return false;
     }
 
+    public boolean isShieldsTooltipShown() {
+        BraveToolbarLayout layout = (BraveToolbarLayout) findViewById(R.id.toolbar);
+        assert layout != null;
+        if (layout != null) {
+            return layout.isShieldsTooltipShown();
+        }
+        return false;
+    }
+
     public Tab selectExistingTab(String url) {
         Tab tab = getActivityTab();
         if (tab != null && tab.getUrlString().equals(url)) {
diff --git a/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java b/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java
index 767fc27c5470..02ac52652cff 100644
--- a/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java
+++ b/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java
@@ -354,7 +354,8 @@ public void onPageLoadFinished(final Tab tab, String url) {
                         OnboardingPrefManager.getInstance().setTimeSavedNotificationStarted(true);
                     }
                     if (mBraveShieldsButton != null && mBraveShieldsButton.isShown()
-                            && mBraveShieldsHandler != null && !mBraveShieldsHandler.isShowing()) {
+                            && mBraveShieldsHandler != null && !mBraveShieldsHandler.isShowing()
+                            && !isRewardsTooltipShown() && !isRewardsPanelOpened()) {
                         checkForTooltip(tab);
                     }
                 }
@@ -564,6 +565,13 @@ public void dismissRewardsTooltip() {
         }
     }
 
+    public boolean isRewardsTooltipShown() {
+        if (mRewardsPopupWindowTooltip != null) {
+            return mRewardsPopupWindowTooltip.isShowing();
+        }
+        return false;
+    }
+
     @Override
     public void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
@@ -980,6 +988,13 @@ public boolean isRewardsPanelOpened() {
         return false;
     }
 
+    public boolean isShieldsTooltipShown() {
+        if (mShieldsPopupWindowTooltip != null) {
+            return mShieldsPopupWindowTooltip.isShowing();
+        }
+        return false;
+    }
+
     @Override
     public void OnNotificationAdded(String id, int type, long timestamp, String[] args) {
         if (mBraveRewardsNativeWorker == null) {
diff --git a/android/java/res/layout/fragment_deprecate_bap_modal_dialog.xml b/android/java/res/layout/fragment_deprecate_bap_modal_dialog.xml
index e3f6458a3f6e..ece118f65625 100644
--- a/android/java/res/layout/fragment_deprecate_bap_modal_dialog.xml
+++ b/android/java/res/layout/fragment_deprecate_bap_modal_dialog.xml
@@ -5,66 +5,75 @@
      You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@android:color/white"
-    android:orientation="vertical">
+    android:fadeScrollbars="false"
+    android:scrollbars="vertical">
 
-    <FrameLayout
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/rewards_modal_background">
-        
-        <ImageView
-            android:layout_width="wrap_content"
+        android:background="@android:color/white"
+        android:orientation="vertical">
+
+        <FrameLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:gravity="center_horizontal"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginBottom="24dp"
-            android:layout_marginTop="24dp"
-            android:src="@drawable/ic_warning_triangle_2"
-            android:contentDescription="@null" />
+            android:background="@drawable/rewards_modal_background">
+            
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center_horizontal"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginBottom="24dp"
+                android:layout_marginTop="24dp"
+                android:src="@drawable/ic_warning_triangle_2"
+                android:contentDescription="@null" />
 
-    </FrameLayout>
+        </FrameLayout>
 
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
-        android:text="@string/rewards_tooltip_title"
-        android:textSize="20sp"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
-        android:layout_marginStart="24dp"
-        android:layout_marginEnd="24dp"
-        android:textColor="@android:color/black"
-        android:textStyle="bold"/>
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
+            android:text="@string/rewards_tooltip_title"
+            android:textSize="20sp"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
+            android:layout_marginStart="24dp"
+            android:layout_marginEnd="24dp"
+            android:textColor="@android:color/black"
+            android:textStyle="bold"/>
 
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="start"
-        android:textSize="16sp"
-        android:text="@string/rewards_modal_text"
-        android:layout_marginBottom="24dp"
-        android:layout_marginStart="24dp"
-        android:layout_marginEnd="24dp"
-        android:textColor="@color/brave_rewards_modal_text_color"/>
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="start"
+            android:textSize="16sp"
+            android:text="@string/rewards_modal_text"
+            android:layout_marginBottom="24dp"
+            android:layout_marginStart="24dp"
+            android:layout_marginEnd="24dp"
+            android:textColor="@color/brave_rewards_modal_text_color"/>
 
-    <Button
-        android:id="@+id/btn_done"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:background="@drawable/blue_rounded_button"
-        android:text="@string/brave_android_sync_disabled_ok"
-        android:layout_marginStart="80dp"
-        android:layout_marginEnd="80dp"
-        android:layout_marginBottom="24dp"
-        android:textAllCaps="false"
-        android:textColor="@android:color/white"
-        android:textSize="16sp"
-        style="?android:attr/borderlessButtonStyle"/>
+        <Button
+            android:id="@+id/btn_done"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:background="@drawable/blue_rounded_button"
+            android:text="@string/brave_android_sync_disabled_ok"
+            android:layout_marginStart="80dp"
+            android:layout_marginEnd="80dp"
+            android:layout_marginBottom="24dp"
+            android:textAllCaps="false"
+            android:textColor="@android:color/white"
+            android:textSize="16sp"
+            style="?android:attr/borderlessButtonStyle"/>
+
+    </LinearLayout>
 
-</LinearLayout>
+</ScrollView>