diff --git a/core/misc/dialog/dialog.position.js b/core/misc/dialog/dialog.position.js
index 40bb5b6..bedd3fd 100644
--- a/core/misc/dialog/dialog.position.js
+++ b/core/misc/dialog/dialog.position.js
@@ -55,6 +55,14 @@
         }
       }
     }
+
+    // If we are not adjusting height but are adjusting min/maxHeight we need to
+    // set height property to 'auto'. If height is not set to 'auto' jQuery UI
+    // dialog _size() will ignore min/maxHeight attribute.
+    if (!adjustedOptions.height && (adjustedOptions.minHeight || adjustedOptions.maxHeight)) {
+      adjustedOptions.height = 'auto';
+    }
+
     // Offset the dialog center to be at the center of Drupal.displace.offsets.
     if (!event.data.settings.modal) {
       adjustedOptions = resetPosition(adjustedOptions);