diff --git a/src/core/css/webcaosdb.css b/src/core/css/webcaosdb.css
index e8b7b42086dd41b0c599fb93b5ac0c1977abfd06..2644e7b3b0938f55e6bc95f4345ae93bc95f80ff 100644
--- a/src/core/css/webcaosdb.css
+++ b/src/core/css/webcaosdb.css
@@ -620,6 +620,10 @@ input[type="file"] {
     margin: 0px;
 }
 
+.caosdb-v-property-value-inputs .bootstrap-select .dropdown-menu .inner {
+  max-height: 300px;
+}
+
 .caosdb-v-property-value-inputs .caosdb-v-edit-value-list-buttons > button {
     padding: 1px;
 }
diff --git a/src/core/js/edit_mode.js b/src/core/js/edit_mode.js
index 43d7b198a1653a2a407d8382fe085a721d13e863..92833771b2c1e3b480dadc0e71fe8a607e080183 100644
--- a/src/core/js/edit_mode.js
+++ b/src/core/js/edit_mode.js
@@ -983,10 +983,10 @@ var edit_mode = new function () {
         } else if (property.datatype == "INTEGER") {
             result = "<input type='number' value='" + property.value + "'></input>";
         } else if (property.datatype == "BOOLEAN") {
-            result = $('<select style="width:80%;display:inline;" class="selectpicker form-control caosdb-list-' + property.datatype + '"><option value=""></option><option value="FALSE">FALSE</option><option value="TRUE">TRUE</option></select>');
+            result = $('<select data-width="80%" class="selectpicker form-control caosdb-list-' + property.datatype + '"><option value=""></option><option value="FALSE">FALSE</option><option value="TRUE">TRUE</option></select>');
             result.val(property.value);
         } else if (property.reference || property.datatype == "FILE") {
-            result = $('<select data-width="80%" data-window-padding="15" data-live-search="true" style="width:80%;display:inline;" class="selectpicker form-control caosdb-list-' + property.datatype + '" data-resolved="false"><option selected class="caosdb-f-option-default" value="' + property.value + '">' + property.value + '</option></select>');
+            result = $('<select data-width="80%" data-virtual-scroll="100" data-window-padding="15" data-live-search="true" class="selectpicker form-control caosdb-list-' + property.datatype + '" data-resolved="false"><option selected class="caosdb-f-option-default" value="' + property.value + '">' + property.value + '</option></select>');
             if (typeof options !== "undefined") {
                 edit_mode.fill_reference_drop_down(result[0], options);
             }