diff --git a/src/components/CustomResources/GroupingListPage.scss b/src/components/CustomResources/GroupingListPage.scss
index 73cf071c7e..52217b73f4 100644
--- a/src/components/CustomResources/GroupingListPage.scss
+++ b/src/components/CustomResources/GroupingListPage.scss
@@ -6,6 +6,12 @@
   ui5-table-cell[slot='default-2'] {
     width: 22vw;
   }
+
+  ui5-panel {
+    &::part(content) {
+      overflow: unset;
+    }
+  }
 }
 
 @media (max-width: 850px) {
diff --git a/src/resources/other/CustomResourcesByGroup.routes.js b/src/resources/other/CustomResourcesByGroup.routes.js
index 0843437a0d..502184066a 100644
--- a/src/resources/other/CustomResourcesByGroup.routes.js
+++ b/src/resources/other/CustomResourcesByGroup.routes.js
@@ -199,9 +199,21 @@ export const ColumnWrapper = ({ defaultColumn = 'list' }) => {
     <FlexibleColumnLayout
       style={{ height: '100%' }}
       layout={layoutState?.layout || 'OneColumn'}
-      startColumn={<div className="column-content">{startColumnComponent}</div>}
-      midColumn={<div className="column-content">{midColumnComponent}</div>}
-      endColumn={<div className="column-content">{endColumnComponent}</div>}
+      startColumn={
+        <div className="column-content">
+          <Suspense fallback={<Spinner />}>{startColumnComponent}</Suspense>
+        </div>
+      }
+      midColumn={
+        <div className="column-content">
+          <Suspense fallback={<Spinner />}>{midColumnComponent}</Suspense>
+        </div>
+      }
+      endColumn={
+        <div className="column-content">
+          <Suspense fallback={<Spinner />}>{endColumnComponent}</Suspense>
+        </div>
+      }
     />
   );
 };