diff --git a/tools/winscope-ng/src/viewers/viewer_surface_flinger/presenter.ts b/tools/winscope-ng/src/viewers/viewer_surface_flinger/presenter.ts
index 2f4e9838f..2ebcb46a9 100644
--- a/tools/winscope-ng/src/viewers/viewer_surface_flinger/presenter.ts
+++ b/tools/winscope-ng/src/viewers/viewer_surface_flinger/presenter.ts
@@ -121,7 +121,7 @@ export class Presenter {
       return rect;
     }) ?? [];
     this.displayIds = [];
-    const rects = this.entry.visibleLayers
+    const rects = this.getLayersForRectsView();
       .sort((layer1: any, layer2: any) => {
         const absZLayer1 = layer1.zOrderPath;
         const absZLayer2 = layer2.zOrderPath;
@@ -148,6 +148,14 @@ export class Presenter {
     return this.rectsToUiData(rects.concat(displayRects));
   }
 
+  private getLayersForRectsView(): Layer[] {
+    const onlyVisible = this.hierarchyUserOptions["onlyVisible"]?.enabled ?? false;
+    // Show only visible layers or Visible + Occluded layers. Don't show all layers
+    // (flattenedLayers) because container layers are never meant to be displayed
+    return this.entry.flattenedLayers
+      .filter((it: any) => it.isVisible || (!onlyVisible && it.occludedBy.length > 0));
+  }
+
   private updateSelectedTreeUiData() {
     if (this.selectedHierarchyTree) {
       this.uiData.propertiesTree = this.getTreeWithTransformedProperties(this.selectedHierarchyTree);