diff --git a/core/css/jquery.ocdialog.css b/core/css/jquery.ocdialog.css
index 6342780aa95e21668410d6e3a5229c08de31bc0c..c300b031afdfd430cd6d362894663831c7e40f39 100644
--- a/core/css/jquery.ocdialog.css
+++ b/core/css/jquery.ocdialog.css
@@ -19,7 +19,6 @@
 .oc-dialog-content {
 	z-index: 1000;
 	background: white;
-	overflow-y: auto;
 }
 .oc-dialog-separator {
 }
diff --git a/core/css/styles.css b/core/css/styles.css
index 08a277a4ea84a0013e45f4b853680b05f93df9b2..78671a7bc11fccc4eae6c221d561fe3d16de9525 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -393,6 +393,7 @@ a.bookmarklet { background-color:#ddd; border:1px solid #ccc; padding:5px;paddin
 #oc-dialog-filepicker-content .dirtree span:not(:last-child)::after { content: '>'; padding: 3px;}
 #oc-dialog-filepicker-content .filelist {
 	overflow-y:auto;
+	max-height: 300px;
 	background-color:white;
 	width:100%;
 }