diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbmediagrid.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbmediagrid.directive.js
index c073c89141..01de877b79 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbmediagrid.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbmediagrid.directive.js
@@ -282,6 +282,7 @@ Use this directive to generate a thumbnail grid of media items.
                     var flexStyle = {
                         "flex": flex + " 1 " + imageMinFlexWidth + "px",
                         "max-width": mediaItem.width + "px",
+                        "max-height": itemMaxHeight + "px",
                         "min-width": itemMinWidth + "px",
                         "min-height": itemMinHeight + "px"
                     };
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/media/umbimagepreview/umb-image-preview.less b/src/Umbraco.Web.UI.Client/src/views/components/media/umbimagepreview/umb-image-preview.less
index 13f934c251..b0ce88a446 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/media/umbimagepreview/umb-image-preview.less
+++ b/src/Umbraco.Web.UI.Client/src/views/components/media/umbimagepreview/umb-image-preview.less
@@ -5,5 +5,6 @@
 
     img {
         width: 100%;
+        max-height: 50vh;
     }
 }