diff --git a/src/main/frontend/components/property.cljs b/src/main/frontend/components/property.cljs
index c3756c7008..c10f067c61 100644
--- a/src/main/frontend/components/property.cljs
+++ b/src/main/frontend/components/property.cljs
@@ -243,14 +243,7 @@
         edit-fn (fn [editor-id id v]
                   (let [v (str v)
                         cursor-range (util/caret-range (gdom/getElement (or id dom-id)))]
-                    (state/set-editing! editor-id v property cursor-range)
-
-                    (js/setTimeout
-                     (fn []
-                       (state/set-editor-action-data! {:block property
-                                                       :pos 0})
-                       (state/set-editor-action! :property-value-search))
-                     50)))
+                    (state/set-editing! editor-id v property cursor-range)))
         multiple-values? (= :many (:cardinality schema))
         type (:type schema)
         editor-args {:block property
diff --git a/src/main/frontend/db/model.cljs b/src/main/frontend/db/model.cljs
index 916887edd2..edb111e1a5 100644
--- a/src/main/frontend/db/model.cljs
+++ b/src/main/frontend/db/model.cljs
@@ -425,6 +425,7 @@ independent of format as format specific heading characters are stripped"
                           :marker (:block/marker e)
                           :priority (:block/priority e)
                           :properties (:block/properties e)
+                          :properties-values (:block/properties-text-values e)
                           :children children
                           :collapsed? (:block/collapsed? e)}]))}
        nil)