diff --git a/app/assets/stylesheets/common/base/modal.scss b/app/assets/stylesheets/common/base/modal.scss
index ce3ff6ca87c..60c411eb572 100644
--- a/app/assets/stylesheets/common/base/modal.scss
+++ b/app/assets/stylesheets/common/base/modal.scss
@@ -130,9 +130,10 @@
   height: 100%;
   z-index: z("modal","content");
   overflow: auto;
-
-  .modal-body {
-    max-height: none !important;
+  &:not(.history-modal) {
+    .modal-body {
+      max-height: none !important;
+    }
   }
 }
 
diff --git a/app/assets/stylesheets/desktop/history.scss b/app/assets/stylesheets/desktop/history.scss
index 3192d0b9b2e..36af336c15e 100644
--- a/app/assets/stylesheets/desktop/history.scss
+++ b/app/assets/stylesheets/desktop/history.scss
@@ -3,9 +3,11 @@
 .modal.history-modal {
 
   .modal-inner-container {
-    min-height: 500px;
     max-width: 960px;
   }
+  .modal-body {
+    height: 70vh;
+  }
   #revision-controls {
     .btn[disabled] {
       cursor: not-allowed;
diff --git a/app/assets/stylesheets/mobile/history.scss b/app/assets/stylesheets/mobile/history.scss
index bae7149be0e..cdcbd44d2e8 100644
--- a/app/assets/stylesheets/mobile/history.scss
+++ b/app/assets/stylesheets/mobile/history.scss
@@ -2,6 +2,15 @@
   button {
     float: none;
   }
+  .modal-body {
+    height: 62vh;
+  }
+  .modal-inner-container {
+    min-height: 400px;
+  }
+  #revisions {
+    max-width: 90vw;
+  }
   #display-modes {
     display: none;
   }