diff --git a/src/main/frontend/components/block.cljs b/src/main/frontend/components/block.cljs
index 2d5e90bbdf..e024116e8a 100644
--- a/src/main/frontend/components/block.cljs
+++ b/src/main/frontend/components/block.cljs
@@ -89,7 +89,8 @@
             [promesa.core :as p]
             [reitit.frontend.easy :as rfe]
             [rum.core :as rum]
-            [shadow.loader :as loader]))
+            [shadow.loader :as loader]
+            [clojure.set :as set]))
 
 ;; local state
 (defonce *dragging?
@@ -2642,12 +2643,15 @@
   "Tags without inline or hidden tags"
   [config block]
   (when (:block/raw-title block)
-    (let [block-tags (->>
+    (let [hidden-internal-tags (cond-> ldb/internal-tags
+                                 (:show-tag-and-property-classes? config)
+                                 (set/difference #{:logseq.class/Tag :logseq.class/Property}))
+          block-tags (->>
                       (:block/tags block)
                       (remove (fn [t]
                                 (or (ldb/inline-tag? (:block/raw-title block) t)
                                     (:logseq.property.class/hide-from-node t)
-                                    (contains? ldb/internal-tags (:db/ident t))))))
+                                    (contains? hidden-internal-tags (:db/ident t))))))
           popup-opts {:align :end
                       :content-props {:on-click (fn [] (shui/popup-hide!))
                                       :class "w-60"}}
diff --git a/src/main/frontend/components/page.cljs b/src/main/frontend/components/page.cljs
index 236e6fa457..a1cc5ff2b0 100644
--- a/src/main/frontend/components/page.cljs
+++ b/src/main/frontend/components/page.cljs
@@ -485,6 +485,7 @@
         :sidebar? sidebar?
         :hide-children? true
         :container-id container-id
+        :show-tag-and-property-classes? true
         :from-journals? (contains? #{:home :all-journals} (get-in (state/get-route-match) [:data :name]))}
        page)]]))