diff --git a/src/main/frontend/components/property.cljs b/src/main/frontend/components/property.cljs
index 398ecbd98b..7d246daf9b 100644
--- a/src/main/frontend/components/property.cljs
+++ b/src/main/frontend/components/property.cljs
@@ -359,16 +359,17 @@
       (when (seq properties)
         [:div
          (for [[prop-uuid-or-built-in-prop v] properties]
-           (if (uuid? prop-uuid-or-built-in-prop)
-             (when-let [property (db/sub-block (:db/id (db/entity [:block/uuid prop-uuid-or-built-in-prop])))]
-               [:div.grid.grid-cols-4.gap-1
-                [:div.property-key.col-span-1
-                 (property-key block property)]
-                [:div.property-value.col-span-3
-                 (property-value block property v block-components-m)]])
-             ;; TODO: built in properties should have UUID and corresponding schema
-             ;; builtin
-             [:div
-              [:a.mr-2 (str prop-uuid-or-built-in-prop)]
-              [:span v]]))])
+           (let [v (get properties-text-values prop-uuid-or-built-in-prop v)]
+             (if (uuid? prop-uuid-or-built-in-prop)
+               (when-let [property (db/sub-block (:db/id (db/entity [:block/uuid prop-uuid-or-built-in-prop])))]
+                 [:div.grid.grid-cols-4.gap-1
+                  [:div.property-key.col-span-1
+                   (property-key block property)]
+                  [:div.property-value.col-span-3
+                   (property-value block property v block-components-m)]])
+               ;; TODO: built in properties should have UUID and corresponding schema
+               ;; builtin
+               [:div
+                [:a.mr-2 (str prop-uuid-or-built-in-prop)]
+                [:span v]])))])
        (new-property repo block edit-input-id properties new-property? block-components-m)])))
diff --git a/src/main/frontend/components/property.css b/src/main/frontend/components/property.css
index 4d45080390..cbbb20e11d 100644
--- a/src/main/frontend/components/property.css
+++ b/src/main/frontend/components/property.css
@@ -19,6 +19,7 @@
 
     .editor-inner {
         padding: 0;
+        width: 100%;
     }
 }