diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/icon-picker-modal/icon-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/icon-picker-modal/icon-picker-modal.element.ts
index e6aa5a8bfd..0311318845 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/icon-picker-modal/icon-picker-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/icon-registry/icon-picker-modal/icon-picker-modal.element.ts
@@ -190,7 +190,10 @@ export class UmbIconPickerModalElement extends UmbModalBaseElement<UmbIconPicker
 				line-height: 0;
 				display: grid;
 				grid-template-columns: repeat(auto-fit, minmax(40px, calc((100% / 12) - 10px)));
+				grid-auto-rows: min-content;
 				gap: 10px;
+				height: 100%;
+				align-items: flex-start;
 				overflow-y: scroll;
 				max-height: 100%;
 				min-height: 0;