diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 8e5b74fe7cc..ac4fb21f48a 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -219,6 +219,8 @@ Other Changes
 * SOLR-9340: Change ZooKeeper disconnect and session expiry related logging from INFO to WARN to
   make debugging easier (Varun Thacker)
 
+* SOLR-9358: [AngularUI] In Cloud->Tree file view area, collapse metadata by default (janhoy)
+
 ==================  6.1.0 ==================
 
 Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
diff --git a/solr/webapp/web/css/angular/cloud.css b/solr/webapp/web/css/angular/cloud.css
index bbb66ae6a59..4017c221683 100644
--- a/solr/webapp/web/css/angular/cloud.css
+++ b/solr/webapp/web/css/angular/cloud.css
@@ -184,6 +184,20 @@ limitations under the License.
   background-image: url( ../../img/ico/cross-1.png );
 }
 
+#content #cloud #file-content #toggle.plus
+{
+  font-style: italic;
+  padding-left: 17px;
+  background-image: url( ../../img/ico/toggle-small-expand.png );
+}
+
+#content #cloud #file-content #toggle.minus
+{
+  font-style: italic;
+  padding-left: 17px;
+  background-image: url( ../../img/ico/toggle-small.png );
+}
+
 #content #cloud #file-content #data
 {
   border-top: 1px solid #c0c0c0;
diff --git a/solr/webapp/web/partials/cloud.html b/solr/webapp/web/partials/cloud.html
index ef39bb302c1..415e123e73d 100644
--- a/solr/webapp/web/partials/cloud.html
+++ b/solr/webapp/web/partials/cloud.html
@@ -23,7 +23,8 @@ limitations under the License.
 
       <div id="file-content" class="clearfix">
 
-        <div id="prop" ng-show="znode.prop && showData">
+        <a id="toggle" ng-click="showProps = !showProps" ng-show="showData" ng-class="showProps ? 'minus' : 'plus'">Metadata</a>
+        <div id="prop" ng-show="znode.prop && showData && showProps">
           <ul>
             <li ng-class="{odd:$odd}" ng-repeat="(key, prop) in znode.prop">
               <dl class="clearfix">