diff --git a/src/main/frontend/components/property/value.cljs b/src/main/frontend/components/property/value.cljs
index 06cd2b9c2a..0ba28112c0 100644
--- a/src/main/frontend/components/property/value.cljs
+++ b/src/main/frontend/components/property/value.cljs
@@ -312,12 +312,14 @@
 
 (defn <create-new-block!
   [block property value]
-  (p/let [last-block-id (db-property-handler/create-property-text-block! block property value
-                                                                       editor-handler/wrap-parse-block
+  (let [{:keys [last-block-id result]} (db-property-handler/create-property-text-block! block property value
+                                                                                        editor-handler/wrap-parse-block
 
-                                                                       {})
-          _ (exit-edit-property)]
-    (editor-handler/edit-block! (db/entity [:block/uuid last-block-id]) :max last-block-id)))
+                                                                                        {})]
+    (p/do!
+     result
+     (exit-edit-property)
+     (editor-handler/edit-block! (db/entity [:block/uuid last-block-id]) :max last-block-id))))
 
 (defn <create-new-block-from-template!
   "`template`: tag block"
diff --git a/src/main/frontend/handler/db_based/property.cljs b/src/main/frontend/handler/db_based/property.cljs
index 3df9bda59d..f1fa4ca5db 100644
--- a/src/main/frontend/handler/db_based/property.cljs
+++ b/src/main/frontend/handler/db_based/property.cljs
@@ -617,11 +617,12 @@
         class? (contains? (:block/type block) "class")
         property-key (:block/original-name property)]
     (db/transact! repo (if page (cons page blocks) blocks) {:outliner-op :insert-blocks})
-    (when property-key
-      (if (and class? class-schema?)
-        (class-add-property! repo (:block/uuid block) property-key)
-        (set-block-property! repo (:block/uuid block) property-key (:block/uuid first-block) {})))
-    last-block-id))
+    (let [result (when property-key
+                   (if (and class? class-schema?)
+                     (class-add-property! repo (:block/uuid block) property-key)
+                     (set-block-property! repo (:block/uuid block) property-key (:block/uuid first-block) {})))]
+      {:last-block-id last-block-id
+       :result result})))
 
 (defn property-create-new-block-from-template
   [block property template]
diff --git a/src/test/frontend/handler/db_based/property_test.cljs b/src/test/frontend/handler/db_based/property_test.cljs
index 51085a8826..b2570a02d2 100644
--- a/src/test/frontend/handler/db_based/property_test.cljs
+++ b/src/test/frontend/handler/db_based/property_test.cljs
@@ -291,7 +291,7 @@
       ;; add property
       (db-property-handler/upsert-property! repo k {:type :default} {})
       (let [property (db/entity [:block/name k])
-            last-block-id (db-property-handler/create-property-text-block! fb property "Block content" editor-handler/wrap-parse-block {})
+            {:keys [last-block-id]} (db-property-handler/create-property-text-block! fb property "Block content" editor-handler/wrap-parse-block {})
             {:keys [from-block-id from-property-id]} (db-property-handler/get-property-block-created-block [:block/uuid last-block-id])]
         (is (= from-block-id (:db/id fb)))
         (is (= from-property-id (:db/id property)))))))