diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java
index 5e9a8bc9bc4a4..34c9c0de44596 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java
@@ -392,6 +392,9 @@ public class NotificationContentView extends FrameLayout {
             mVisibleType = visibleType;
             updateBackgroundColor(true /* animate */);
         }
+        if (mForceSelectNextLayout) {
+            forceUpdateVisibilities();
+        }
         if (mTransformationStartVisibleType != UNDEFINED
                 && mVisibleType != mTransformationStartVisibleType
                 && getViewForVisibleType(mTransformationStartVisibleType) != null) {
@@ -508,9 +511,6 @@ public class NotificationContentView extends FrameLayout {
                 updateBackgroundColor(animate);
             }
         }
-        if (mForceSelectNextLayout) {
-            forceUpdateVisibilities();
-        }
     }
 
     private void forceUpdateVisibilities() {