diff --git a/lib/scripts/media.js b/lib/scripts/media.js
index e48c9c1b012786d22e808e9366b524c9769f1d12..f4064efd5a77edcc3789d04013924c4d3cc96930 100644
--- a/lib/scripts/media.js
+++ b/lib/scripts/media.js
@@ -26,6 +26,7 @@ var dw_mediamanager = {
     view: false,
 
     layout_width: 0,
+    layout_height: 0,
 
     init: function () {
         var $content, $tree;
@@ -480,6 +481,18 @@ var dw_mediamanager = {
             jQuery(this).width(w);
         });
 
+        var windowHeight = jQuery(window).height();
+        var height = windowHeight - 300;
+        if (layout_height < height) {
+            layout_height = height;
+            jQuery('#mediamanager__layout .scroll-container').each(function (i) {
+                jQuery(this).height(height);
+            });
+            $resizable.each(function() {
+                jQuery(this).height(height+100);
+            });
+        }
+
         dw_mediamanager.opacity_slider();
         dw_mediamanager.portions_slider();
     },
@@ -526,6 +539,7 @@ var dw_mediamanager = {
 
         var windowHeight = jQuery(window).height();
         var height = windowHeight - 300;
+        layout_height = height;
         jQuery('#mediamanager__layout .scroll-container').each(function (i) {
             jQuery(this).height(height);
         });