diff --git a/core/java/com/android/internal/widget/ActionBarContainer.java b/core/java/com/android/internal/widget/ActionBarContainer.java
index 9b261ac11cce3..8111e637a9173 100644
--- a/core/java/com/android/internal/widget/ActionBarContainer.java
+++ b/core/java/com/android/internal/widget/ActionBarContainer.java
@@ -276,8 +276,8 @@ public class ActionBarContainer extends FrameLayout {
                 continue;
             }
             final LayoutParams lp = (LayoutParams) child.getLayoutParams();
-            nonTabMaxHeight = isCollapsed(child) ? 0 :
-                    child.getMeasuredHeight() + lp.topMargin + lp.bottomMargin;
+            nonTabMaxHeight = Math.max(nonTabMaxHeight, isCollapsed(child) ? 0 :
+                    child.getMeasuredHeight() + lp.topMargin + lp.bottomMargin);
         }
 
         if (mTabContainer != null && mTabContainer.getVisibility() != GONE) {