diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 796caa0..c396f84 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -4359,12 +4359,14 @@
     protected int computeMinScroll() {
         if (getTaskViewCount() > 0) {
             int minScroll;
+            boolean isLandscapeGridSplit = mActivity.getDeviceProfile().isLandscape
+                    && showAsGrid() && isSplitSelectionActive();
             if (mIsRtl) {
                 // If we aren't showing the clear all button, use the rightmost task as the min
                 // scroll.
                 minScroll = getScrollForPage(mDisallowScrollToClearAll ? indexOfChild(
                         getTaskViewAt(getTaskViewCount() - 1)) : indexOfChild(mClearAllButton));
-                if (showAsGrid() && isSplitSelectionActive()
+                if (isLandscapeGridSplit
                         && mSplitSelectStateController.getActiveSplitStagePosition()
                         == SplitConfigurationOptions.STAGE_POSITION_BOTTOM_OR_RIGHT) {
                     minScroll -= mSplitPlaceholderSize;
@@ -4373,7 +4375,8 @@
                 TaskView focusedTaskView = mShowAsGridLastOnLayout ? getFocusedTaskView() : null;
                 minScroll = getScrollForPage(focusedTaskView != null ? indexOfChild(focusedTaskView)
                         : 0);
-                // TODO(b/200537659): Adjust according to mSplitPlaceholderSize.
+                // TODO(b/200537659): Adjust according to mSplitPlaceholderSize when
+                //  isLandscapeGridSplit is true.
             }
             return minScroll;
         }
@@ -4384,11 +4387,13 @@
     protected int computeMaxScroll() {
         if (getTaskViewCount() > 0) {
             int maxScroll;
+            boolean isLandscapeGridSplit = mActivity.getDeviceProfile().isLandscape
+                    && showAsGrid() && isSplitSelectionActive();
             if (mIsRtl) {
                 TaskView focusedTaskView = mShowAsGridLastOnLayout ? getFocusedTaskView() : null;
                 maxScroll = getScrollForPage(focusedTaskView != null ? indexOfChild(focusedTaskView)
                         : 0);
-                if (showAsGrid() && isSplitSelectionActive()
+                if (isLandscapeGridSplit
                         && mSplitSelectStateController.getActiveSplitStagePosition()
                         == SplitConfigurationOptions.STAGE_POSITION_TOP_OR_LEFT) {
                     maxScroll += mSplitPlaceholderSize;
@@ -4398,7 +4403,8 @@
                 // scroll.
                 maxScroll = getScrollForPage(mDisallowScrollToClearAll ? indexOfChild(
                         getTaskViewAt(getTaskViewCount() - 1)) : indexOfChild(mClearAllButton));
-                // TODO(b/200537659): Adjust according to mSplitPlaceholderSize.
+                // TODO(b/200537659): Adjust according to mSplitPlaceholderSize when
+                //  isLandscapeGridSplit is true.
             }
             return maxScroll;
         }
