diff --git a/src/core/js/query_shortcuts.js b/src/core/js/query_shortcuts.js
index c12e2b47b7c8b970b2a8177ebdb529dd5cb47efa..aac82000663cb47453147ef63d51d3a8d138b15d 100644
--- a/src/core/js/query_shortcuts.js
+++ b/src/core/js/query_shortcuts.js
@@ -824,20 +824,29 @@ var query_shortcuts = new function() {
             fields: this.make_create_fields(entity[0]),
         };
         var form = form_elements.make_form(form_config);
+        this._toggle_entity_property_class(form);
+
 
         this.logger.trace("leave make_create_form", form);
         return form;
     }
 
+    this._toggle_entity_property_class = function(form) {
+        form.addEventListener("caosdb.form.ready", () => {
+            $(form).find(".caosdb-f-field").toggleClass("caosdb-f-entity-property", true);
+        });
+        $(form).find(".caosdb-f-field").toggleClass("caosdb-f-entity-property", true);
+    }
+
     this.make_create_fields = function(include) {
         return [
             include,
             {
-                type: "text", name: query_shortcuts._shortcuts_property_description_name, required: true,
+                type: "text", name: query_shortcuts._shortcuts_property_description_name,
                 label: "Description", required: true, cached: true,
                 //help: query_shortcuts._description_help, TODO
             }, {
-                type: "text", name: query_shortcuts._shortcuts_property_query_name, required: true,
+                type: "text", name: query_shortcuts._shortcuts_property_query_name,
                 label: "Query", required: true, cached: true,
                 //help: query_shortcuts._query_help, TODO
             }
@@ -933,6 +942,7 @@ var query_shortcuts = new function() {
             fields: this.make_update_fields(entity[0], olddef.attr("data-shortcut-description"), olddef.attr("data-query-string")),
         };
         var form = form_elements.make_form(form_config);
+        this._toggle_entity_property_class(form);
 
         this.logger.trace("leave make_update_form", form);
         return form;