diff --git a/jquery.colorbox.js b/jquery.colorbox.js
index 1e6c0d9..19c8146 100644
--- a/jquery.colorbox.js
+++ b/jquery.colorbox.js
@@ -732,7 +732,7 @@
 			if (!options.innerHeight && !options.height) {
 				scrolltop = $loaded.scrollTop();
 				$loaded.css({height: "auto"});
-				settings.h = $loaded.height();
+				settings.h = Math.min($loaded.height(), setSize(settings.get('maxHeight')||'100%', 'y') - loadedHeight - interfaceHeight);
 			}
 
 			$loaded.css({height: settings.h});