diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
index f24c1b625ea4b..48c54fc7a85f4 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
@@ -73,8 +73,7 @@ public void registerStatusBar(PhoneStatusBar phoneStatusBar,
     public void show(Bundle options) {
         mShowing = true;
         mStatusBarWindowManager.setKeyguardShowing(true);
-        showBouncerOrKeyguard();
-        updateStates();
+        reset();
     }
 
     /**
@@ -105,13 +104,15 @@ private void showBouncer() {
      * Reset the state of the view.
      */
     public void reset() {
-        if (mOccluded) {
-            mPhoneStatusBar.hideKeyguard();
-            mBouncer.hide();
-        } else {
-            showBouncerOrKeyguard();
+        if (mShowing) {
+            if (mOccluded) {
+                mPhoneStatusBar.hideKeyguard();
+                mBouncer.hide();
+            } else {
+                showBouncerOrKeyguard();
+            }
+            updateStates();
         }
-        updateStates();
     }
 
     public void onScreenTurnedOff() {
@@ -121,7 +122,6 @@ public void onScreenTurnedOff() {
 
     public void onScreenTurnedOn(final IKeyguardShowCallback callback) {
         mScreenOn = true;
-        reset();
         if (callback != null) {
             callbackAfterDraw(callback);
         }