diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java
index 2f88e21c315ab..6db2e640e77b2 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java
@@ -553,8 +553,9 @@ public class StatusBarHeaderView extends RelativeLayout implements View.OnClickL
         }
 
         public void update() {
-            final boolean onKeyguardAndCollapsed = mKeyguardShowing && !mExpanded;
-            mSystemIconsContainer.setClipBounds(onKeyguardAndCollapsed ? null : mClipBounds);
+            final boolean collapsedKeyguard = mKeyguardShowing && !mExpanded;
+            final boolean expanded = mExpanded && !mOverscrolled;
+            mSystemIconsContainer.setClipBounds(collapsedKeyguard || expanded ? null : mClipBounds);
         }
     }