diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java
index 2b3d05da3e..e09306e573 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java
@@ -1229,6 +1229,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());
     }