diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java
index c7d8a50383..b0cde752d4 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java
@@ -1218,6 +1218,11 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar
         } else {
             taskbarWindowSize = deviceProfile.taskbarHeight + deviceProfile.getTaskbarOffsetY();
         }
+        if (mBubbleControllers != null) {
+            int bubbleBarMaxHeight = mBubbleControllers.bubbleBarViewController
+                    .getBubbleBarWithFlyoutMaximumHeight();
+            taskbarWindowSize = Math.max(taskbarWindowSize, bubbleBarMaxHeight);
+        }
         mActivity.setTaskbarWindowSize(taskbarWindowSize);
         mTaskbarNavButtonTranslationY.updateValue(-deviceProfile.getTaskbarOffsetY());
     }