diff --git a/src/main/frontend/components/block.cljs b/src/main/frontend/components/block.cljs
index 9b44cbdab9..cf01c9a376 100644
--- a/src/main/frontend/components/block.cljs
+++ b/src/main/frontend/components/block.cljs
@@ -714,8 +714,9 @@
    All page-names are sanitized except page-name-in-block"
   [state
    {:keys [contents-page? whiteboard-page? other-position?
-           on-context-menu stop-event-propagation? with-tags?]
-    :or {with-tags? true}
+           on-context-menu stop-event-propagation? with-tags? show-unique-title?]
+    :or {with-tags? true
+         show-unique-title? true}
     :as config}
    page-entity children label]
   (let [*mouse-down? (::mouse-down? state)
@@ -798,7 +799,9 @@
           (ldb/page? page-entity)
           (if untitled?
             (t :untitled)
-            (let [s (util/trim-safe (block-handler/block-unique-title page-entity {:with-tags? with-tags?}))]
+            (let [s (util/trim-safe (if show-unique-title?
+                                      (block-handler/block-unique-title page-entity {:with-tags? with-tags?})
+                                      (:block/title page-entity)))]
               (if (and tag? (not (:hide-tag-symbol? config)))
                 (str "#" s)
                 s)))
diff --git a/src/main/frontend/components/class.cljs b/src/main/frontend/components/class.cljs
index 7f613f1607..a2dc9193ca 100644
--- a/src/main/frontend/components/class.cljs
+++ b/src/main/frontend/components/class.cljs
@@ -13,7 +13,8 @@
     (when (seq children)
       [:ul
        (for [child (sort-by :block/title children)]
-         (let [title [:li.ml-2 (block/page-reference {:show-brackets? false} (:block/uuid child) nil)]]
+         (let [title [:li.ml-2 (block/page-reference {:show-brackets? false
+                                                      :show-unique-title? false} (:block/uuid child) nil)]]
            (if (seq (:logseq.property.class/_extends child))
              (ui/foldable
               title