diff --git a/src/lib/dialog/dialog.scss b/src/lib/dialog/dialog.scss
index 03a72fc6802f..8e7f2f20f13f 100644
--- a/src/lib/dialog/dialog.scss
+++ b/src/lib/dialog/dialog.scss
@@ -22,6 +22,11 @@ $mat-dialog-button-margin: 8px !default;
   width: 100%;
   height: 100%;
 
+  // Since the dialog won't stretch to fit the parent, if the height
+  // isn't set, we have to inherit the min and max values explicitly.
+  min-height: inherit;
+  max-height: inherit;
+
   @include cdk-high-contrast {
     outline: solid 1px;
   }