diff --git a/modules/comment/comment.item.php b/modules/comment/comment.item.php
index 578d25415..121497409 100644
--- a/modules/comment/comment.item.php
+++ b/modules/comment/comment.item.php
@@ -304,7 +304,7 @@
                $GLOBALS['__member_signature_max_height'] = $member_config->signature_max_height;
             }
             $max_signature_height = $GLOBALS['__member_signature_max_height'];
-            if($max_signature_height) $signature = sprintf('<div style="height:%dpx;overflow-y:auto;overflow-x:hidden;">%s</div>',$max_signature_height, $signature);
+            if($max_signature_height) $signature = sprintf('<div style="max-height:%dpx;overflow:auto;overflow-x:hidden;height:expression(this.scrollHeight > %d ? \'%dpx\': \'auto\')">%s</div>', $max_signature_height, $max_signature_height, $max_signature_height, $signature);
 
             return $signature;
         }
diff --git a/modules/document/document.item.php b/modules/document/document.item.php
index 76f87454a..266bff782 100644
--- a/modules/document/document.item.php
+++ b/modules/document/document.item.php
@@ -644,7 +644,7 @@
             }
             if($signature) {
                 $max_signature_height = $GLOBALS['__member_signature_max_height'];
-                if($max_signature_height) $signature = sprintf('<div style="height:%dpx;overflow-y:auto;overflow-x:hidden;">%s</div>',$max_signature_height, $signature);
+                if($max_signature_height) $signature = sprintf('<div style="max-height:%dpx;overflow:auto;overflow-x:hidden;height:expression(this.scrollHeight > %d ? \'%dpx\': \'auto\')">%s</div>', $max_signature_height, $max_signature_height, $max_signature_height, $signature);
             }
 
             return $signature;