diff --git a/libhwcomposer/hwc_utils.cpp b/libhwcomposer/hwc_utils.cpp
index 350684b..7c4ad27 100644
--- a/libhwcomposer/hwc_utils.cpp
+++ b/libhwcomposer/hwc_utils.cpp
@@ -126,6 +126,7 @@
             //Do not mark as SKIP if it is secure buffer
             if (isSkipLayer(&list->hwLayers[i]) && !yuvSecure) {
                 isYuvLayerSkip = true;
+                skipCount++;
             }
         } else if(UNLIKELY(isExtCC(hnd))) {
             ccLayerIndex = i;
@@ -137,15 +138,8 @@
             extCount++;
             //If BLOCK layer present, dont cache index, display BLOCK only.
             if(isExtBlockPresent == false) extLayerIndex = i;
-        } else if (isSkipLayer(&list->hwLayers[i])) { //Popups
-            //If video layer is below a skip layer
-            if(yuvLayerIndex != -1 && yuvLayerIndex < (ssize_t)i) {
-                //Do not mark as SKIP if it is secure buffer
-                if (!yuvSecure) {
-                    isYuvLayerSkip = true;
-                    skipCount++;
-                }
-            }
+        } else if (isSkipLayer(&list->hwLayers[i])) {
+            skipCount++;
         }
     }