diff --git a/src/definitions/modules/dimmer.js b/src/definitions/modules/dimmer.js
index 148ec7398..183e11283 100755
--- a/src/definitions/modules/dimmer.js
+++ b/src/definitions/modules/dimmer.js
@@ -85,7 +85,7 @@ $.fn.dimmer = function(parameters) {
               .on(clickEvent + eventNamespace, module.toggle)
             ;
           }
-
+          console.log($module, module.is.page());
           if( module.is.page() ) {
             module.debug('Setting as a page dimmer', $dimmable);
             module.set.pageDimmer();
diff --git a/src/definitions/modules/modal.js b/src/definitions/modules/modal.js
index b9bdd0ff9..aefaa53df 100755
--- a/src/definitions/modules/modal.js
+++ b/src/definitions/modules/modal.js
@@ -436,7 +436,7 @@ $.fn.modal = function(parameters) {
 
         cacheSizes: function() {
           module.cache = {
-            pageHeight    : $body.outerHeight(),
+            pageHeight    : $(document).outerHeight(),
             height        : $module.outerHeight() + settings.offset,
             contextHeight : (settings.context == 'body')
               ? $(window).height()
diff --git a/src/definitions/modules/modal.less b/src/definitions/modules/modal.less
index 4ff5d60ea..c79edc0d4 100755
--- a/src/definitions/modules/modal.less
+++ b/src/definitions/modules/modal.less
@@ -241,6 +241,10 @@
 *******************************/
 
 /* A modal that cannot fit on the page */
+
+body.ui.scrolling.dimmable {
+  height: auto;
+}
 .ui.modal.scrolling {
   position: absolute;
   margin-top: @scrollingTopMargin;