diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-media/input-media.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-media/input-media.element.ts
index d350b8ac7f..fe1a23ce8c 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-media/input-media.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/components/input-media/input-media.element.ts
@@ -133,11 +133,12 @@ export class UmbInputMediaElement extends FormControlMixin(UmbLitElement) {
 				display: grid;
 				gap: var(--uui-size-space-3);
 				grid-template-columns: repeat(auto-fill, minmax(160px, 1fr));
+				grid-template-rows: repeat(auto-fill, minmax(160px, 1fr));
 			}
 
 			#add-button {
 				text-align: center;
-				height: 160px;
+				height: 100%;
 			}
 
 			uui-icon {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/components/input-template/input-template.element.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/components/input-template/input-template.element.ts
index 489e20a48a..ae013b4225 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/components/input-template/input-template.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/components/input-template/input-template.element.ts
@@ -178,20 +178,16 @@ export class UmbInputTemplateElement extends FormControlMixin(UmbLitElement) {
 
 	static styles = [
 		css`
-			#add-button {
-				width: 100%;
-			}
 			:host {
-				box-sizing: border-box;
-				display: flex;
-				gap: var(--uui-size-space-4);
-				flex-wrap: wrap;
+				display: grid;
+				gap: var(--uui-size-space-3);
+				grid-template-columns: repeat(auto-fill, minmax(160px, 1fr));
+				grid-template-rows: repeat(auto-fill, minmax(160px, 1fr));
 			}
 
-			:host > * {
-				max-width: 180px;
-				min-width: 180px;
-				min-height: 150px;
+			#add-button {
+				text-align: center;
+				height: 100%;
 			}
 		`,
 	];