diff --git a/src/components-examples/cdk-experimental/tree/tree-common.css b/src/components-examples/cdk-experimental/tree/tree-common.css
index cb7375479822..f0ffcf980c14 100644
--- a/src/components-examples/cdk-experimental/tree/tree-common.css
+++ b/src/components-examples/cdk-experimental/tree/tree-common.css
@@ -49,6 +49,7 @@
   margin-left: auto;
 }
 
+.example-tree-item[aria-current] .example-selected-icon,
 .example-tree-item[aria-selected='true'] .example-selected-icon {
   visibility: visible;
 }
diff --git a/src/dev-app/cdk-experimental-tree/cdk-tree-demo.css b/src/dev-app/cdk-experimental-tree/cdk-tree-demo.css
index f8a48cfb9014..aea192bb91f8 100644
--- a/src/dev-app/cdk-experimental-tree/cdk-tree-demo.css
+++ b/src/dev-app/cdk-experimental-tree/cdk-tree-demo.css
@@ -1,6 +1,6 @@
 .example-tree-grid {
   display: grid;
-  grid-template-columns: repeat(auto-fit, 100%);
+  grid-template-columns: repeat(auto-fit, minmax(24rem, 1fr));
   gap: 20px;
 }