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 b9acbd9fd0e99..343b53bcd4764 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java
@@ -194,6 +194,7 @@ protected void onFinishInflate() {
         mSignalCluster = findViewById(R.id.signal_cluster);
         mSystemIcons = (LinearLayout) findViewById(R.id.system_icons);
         loadDimens();
+        updateStatusBarPowerMenuVisibility();
         updateVisibilities();
         updateClockScale();
         updateAvatarScale();
@@ -342,6 +343,7 @@ public void updateEverything() {
         updateSystemIconsLayoutParams();
         updateClickTargets();
         updateMultiUserSwitch();
+        updateStatusBarPowerMenuVisibility();
         if (mQSPanel != null) {
             mQSPanel.setExpanded(mExpanded);
         }
@@ -372,7 +374,6 @@ private void updateVisibilities() {
         mEmergencyCallsOnly.setVisibility(mExpanded && mShowEmergencyCallsOnly ? VISIBLE : GONE);
         mBatteryLevel.setVisibility(((mExpanded && (mShowBatteryText == 0 || mBatteryCharging))
                 || mShowBatteryText == 2) ? View.VISIBLE : View.GONE);
-        mStatusBarPowerMenu.setVisibility(mExpanded && (mStatusBarPowerMenuStyle != STATUS_BAR_POWER_MENU_OFF) ? View.VISIBLE : View.GONE);
     }
 
     private void updateSignalClusterDetachment() {
@@ -437,6 +438,12 @@ private void updateAmPmTranslation() {
         mAmPm.setTranslationX((rtl ? 1 : -1) * mTime.getWidth() * (1 - mTime.getScaleX()));
     }
 
+    private void updateStatusBarPowerMenuVisibility() {
+        mStatusBarPowerMenu.setVisibility(mExpanded
+                && (mStatusBarPowerMenuStyle != STATUS_BAR_POWER_MENU_OFF) ? View.VISIBLE
+                : View.GONE);
+    }
+
     @Override
     public void onBatteryLevelChanged(int level, boolean pluggedIn, boolean charging) {
         mBatteryLevel.setText(getResources().getString(R.string.battery_level_template, level));
@@ -838,6 +845,7 @@ public void onClick(View v) {
             } else {
                 mQsDetailHeader.setClickable(false);
             }
+            updateStatusBarPowerMenuVisibility();
         }
 
         private void transition(final View v, final boolean in) {