diff --git a/ui/ui.dialog.js b/ui/ui.dialog.js
index 52a9d21a61..fb3def4462 100644
--- a/ui/ui.dialog.js
+++ b/ui/ui.dialog.js
@@ -469,7 +469,7 @@ $.widget("ui.dialog", {
 				minHeight: Math.max(options.minHeight - nonContentHeight, 0),
 				height: options.height == 'auto'
 					? 'auto'
-					: options.height - nonContentHeight
+					: Math.max(options.height - nonContentHeight, 0)
 			});
 	}
 });