diff --git a/jquery.scrollbar.js b/jquery.scrollbar.js
index 0883fd3..e1afe36 100644
--- a/jquery.scrollbar.js
+++ b/jquery.scrollbar.js
@@ -196,7 +196,8 @@
 
                 c.on('scroll' + namespace, function (event) {
                     var scrollLeft = c.scrollLeft();
-                    var scrollTop = c.scrollTop();
+                    var scrollTop = c.scrollTop();                                        
+                    
                     if (o.isRtl) {
                         // webkit   0:100
                         // ie/edge  100:0
@@ -618,10 +619,17 @@
                         "max-height": "none"
                     });
                 } else {
+                  if ((browser.msedge || browser.msie) && container.css('overflow-x') === 'hidden') {
+                    // do not add scroll.height if it is hidden
                     containerWrapper.css({
-                        //"height": "auto", // do not reset height value: issue with height:100%!
-                        "max-height": (AreaVisible + browser.scroll.height) + 'px'
+                      "max-height": AreaVisible + 'px'
                     });
+                  } else {
+                    containerWrapper.css({
+                      //"height": "auto", // do not reset height value: issue with height:100%!
+                      "max-height": (AreaVisible + browser.scroll.height) + 'px'
+                    });
+                  }
                 }
             }