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 13d3291e43e50..471e8d38adf8b 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java
@@ -138,6 +138,7 @@ public class StatusBarHeaderView extends RelativeLayout implements View.OnClickL
             updateBrightnessControllerState();
             updateZTranslation();
             updateClickTargets();
+            updateWidth();
             if (mQSPanel != null) {
                 mQSPanel.setExpanded(expanded && !overscrolled);
             }
@@ -173,7 +174,7 @@ public class StatusBarHeaderView extends RelativeLayout implements View.OnClickL
     }
 
     private void updateWidth() {
-        int width = mKeyguardShowing ? mKeyguardWidth : mNormalWidth;
+        int width = (mKeyguardShowing && !mExpanded) ? mKeyguardWidth : mNormalWidth;
         ViewGroup.LayoutParams lp = getLayoutParams();
         if (width != lp.width) {
             lp.width = width;