diff --git a/less/modals.less b/less/modals.less
index abf46cce82..d9aa0e2ced 100644
--- a/less/modals.less
+++ b/less/modals.less
@@ -15,8 +15,7 @@
 // Container that the modal scrolls within
 .modal {
   display: none;
-  overflow: auto;
-  overflow-y: scroll;
+  overflow: hidden;
   position: fixed;
   top: 0;
   right: 0;
@@ -36,6 +35,10 @@
   }
   &.in .modal-dialog { .translate3d(0, 0, 0) }
 }
+.modal-open .modal {
+  overflow: auto;
+  overflow-y: scroll;
+}
 
 // Shell div to position the modal with bottom padding
 .modal-dialog {