diff --git a/src/main/frontend/components/block.cljs b/src/main/frontend/components/block.cljs
index da17354530..9c96dbdb32 100644
--- a/src/main/frontend/components/block.cljs
+++ b/src/main/frontend/components/block.cljs
@@ -2390,14 +2390,13 @@
                        (remove (fn [t] (= (:db/ident t) :logseq.class/Task)) tags')
                        tags')]
       (when (seq block-tags)
-        [:div.block-tags.flex.flex-row.flex-wrap.items-center.gap-1
+        [:div.block-tags
          (for [tag block-tags]
-           [:span.h-6
-            (rum/with-key
-              (page-cp (assoc config
+           [:div.block-tag
+            {:key (str "tag-" (:db/id tag))}
+            (page-cp (assoc config
                               :tag? true
-                              :disable-preview? true) tag)
-              (str "tag-" (:db/id tag)))])]))))
+                              :disable-preview? true) tag)])]))))
 
 (rum/defc block-positioned-properties
   [config block position]
diff --git a/src/main/frontend/components/block.css b/src/main/frontend/components/block.css
index b6946cec88..f136323aaa 100644
--- a/src/main/frontend/components/block.css
+++ b/src/main/frontend/components/block.css
@@ -863,3 +863,13 @@ html.is-mac {
     text-overflow: ellipsis;
   }
 }
+
+.block-tags {
+    @apply flex flex-row flex-wrap items-center gap-1;
+    max-width: 256px;
+}
+.block-tag span {
+    @apply h-6 whitespace-nowrap overflow-hidden;
+    max-width: 160px;
+    text-overflow: ellipsis;
+}