diff --git a/Bootstrap.Admin/Content/css/admin-responsive.css b/Bootstrap.Admin/Content/css/admin-responsive.css
index 9ecdc631..8be5dc59 100644
--- a/Bootstrap.Admin/Content/css/admin-responsive.css
+++ b/Bootstrap.Admin/Content/css/admin-responsive.css
@@ -114,9 +114,30 @@
     }
 }
 
-@media (max-height: 400px) {
+@media (min-height: 568px) {
     .modal-body {
-        height: 180px;
+        max-height: 440px;
+        overflow-y: auto;
+    }
+}
+
+@media (max-height: 567px) {
+    .modal-body {
+        height: 260px;
+        overflow-y: auto;
+    }
+}
+
+@media (max-height: 414px) {
+    .modal-body {
+        height: 190px;
+        overflow-y: auto;
+    }
+}
+
+@media (max-height: 320px) {
+    .modal-body {
+        height: 150px;
         overflow-y: auto;
     }
 }
diff --git a/Bootstrap.Admin/Content/css/fa.css b/Bootstrap.Admin/Content/css/fa.css
index f075dcf9..c2ba5cfe 100644
--- a/Bootstrap.Admin/Content/css/fa.css
+++ b/Bootstrap.Admin/Content/css/fa.css
@@ -97,6 +97,8 @@
         top: 62px;
         bottom: 80px;
         overflow: auto;
+        max-height: inherit;
+        height: inherit;
     }
 
     .icon-content .modal-footer {