diff --git a/src/core/js/edit_mode.js b/src/core/js/edit_mode.js
index 27b5820ed75ec8802fcf3b0dc5aee183ec84f60a..63b28b08a6c07d4c5b00795f5e9f87d1965e4031 100644
--- a/src/core/js/edit_mode.js
+++ b/src/core/js/edit_mode.js
@@ -986,7 +986,7 @@ var edit_mode = new function () {
             result = "<input type='number' step='any' value='" + property.value + "'></input>";
         } else if (property.datatype == "INTEGER") {
             result = "<input type='number' value='" + property.value + "'></input>";
-        } else if (property.datatype == "BOOLEAN") {
+        } else if (property.datatype == "BOOLEAN" || property.datatype == "FILE" || property.reference) {
             result = $('<div/>');
             var css = {
                 "min-height": "38px",
@@ -994,30 +994,25 @@ var edit_mode = new function () {
                 "display": "inline-block",
             };
             result.css(css);
-            const select = $(`<select data-container="body" class="selectpicker form-control caosdb-list-${property.datatype}"><option value=""></option><option>FALSE</option><option>TRUE</option></select>`);
-            if (property.value) {
-                select.val(property.value);
-            }
-            result.append(select);
-        } else if (property.reference || property.datatype == "FILE") {
-            result = $('<div/>');
-            var css = {
-                "min-height": "38px",
-                "width": "80%",
-                "display": "inline-block",
-            };
-            result.css(css);
-            result.append(`<select style="display: none"><option selected>${property.value}</option></select>`);
-            result.append(createWaitingNotification(property.value));
 
-            const select = $('<select data-container="body" data-virtual-scroll="100" data-window-padding="15" data-live-search="true" class="selectpicker form-control caosdb-list-' + property.datatype + '" data-resolved="false"><option value=""></option></select>');
-            options.then((_options) => {
-                edit_mode.fill_reference_drop_down(select[0], _options, property.value);
-                result.empty();
+            if (property.datatype == "BOOLEAN") {
+                const select = $(`<select data-container="body" class="selectpicker form-control caosdb-list-${property.datatype}"><option value=""></option><option>FALSE</option><option>TRUE</option></select>`);
+                if (property.value) {
+                    select.val(property.value);
+                }
                 result.append(select);
-                edit_mode._init_select(select);
-            });
-
+            } else { // references and files
+                result.append(`<select style="display: none"><option selected>${property.value}</option></select>`);
+                result.append(createWaitingNotification(property.value));
+
+                const select = $('<select data-container="body" data-virtual-scroll="100" data-window-padding="15" data-live-search="true" class="selectpicker form-control caosdb-list-' + property.datatype + '" data-resolved="false"><option value=""></option></select>');
+                options.then((_options) => {
+                    edit_mode.fill_reference_drop_down(select[0], _options, property.value);
+                    result.empty();
+                    result.append(select);
+                    edit_mode._init_select(select);
+                });
+            }
         } else {
             throw ("Unsupported data type: `" + property.datatype + "`. Please issue a feature request.");
         }
@@ -2102,4 +2097,4 @@ var edit_mode = new function () {
  */
 $(document).ready(function () {
     edit_mode.init();
-});
+});
\ No newline at end of file