diff --git a/src/main/frontend/components/block.cljs b/src/main/frontend/components/block.cljs
index c67826cacd..4ef9c9ef8f 100644
--- a/src/main/frontend/components/block.cljs
+++ b/src/main/frontend/components/block.cljs
@@ -2857,7 +2857,7 @@
                                                (:block/properties-text-values block)
                                                edit-input-id {:inline-text inline-text
                                                               :page-cp page-cp
-                                                              :block-cp block-reference
+                                                              :block-cp blocks-container
                                                               :editor-box (get config :editor-box)
                                                               :selected? selected?}))])
 
diff --git a/src/main/frontend/components/property.cljs b/src/main/frontend/components/property.cljs
index 4d50ff4357..a66e468683 100644
--- a/src/main/frontend/components/property.cljs
+++ b/src/main/frontend/components/property.cljs
@@ -275,7 +275,8 @@
                 (page-cp {} page))
 
               :block
-              (block-cp {} value nil)
+              [:div.property-block-container.w-full
+               (block-cp [(db/entity [:block/uuid value])] {:editor-box editor-box})]
 
               (inline-text {} :markdown (str value))))])))))
 
diff --git a/src/main/frontend/components/property.css b/src/main/frontend/components/property.css
index 93de9d72d9..2c27d18681 100644
--- a/src/main/frontend/components/property.css
+++ b/src/main/frontend/components/property.css
@@ -39,6 +39,14 @@
     .cp__select-input {
         padding: 0.5em 1em;
     }
+
+    .ls-block, .editor-wrapper {
+        margin: 0;
+    }
+
+    .property-block-container {
+        margin-left: -1.5em;
+    }
 }
 
 input.simple-input {