diff --git a/src/main/frontend/components/property.cljs b/src/main/frontend/components/property.cljs
index 3dc58d17e1..8f079242b7 100644
--- a/src/main/frontend/components/property.cljs
+++ b/src/main/frontend/components/property.cljs
@@ -272,8 +272,11 @@
                        (map (fn [k] [k nil]) properties))
                      (:block/properties block))
         alias (set (map :block/uuid (:block/alias block)))
+        tags (set (map :block/uuid (:block/tags block)))
         alias-properties (when (seq alias)
                            [[(:block/uuid (db/entity [:block/name "alias"])) alias]])
+        tags-properties (when (seq tags)
+                          [[(:block/uuid (db/entity [:block/name "tags"])) tags]])
         class-properties (->> (:block/tags block)
                               (mapcat (fn [tag]
                                         (when (= "class" (:block/type tag))
@@ -284,7 +287,8 @@
         built-in-properties (set/difference
                              (set (map name gp-property/db-built-in-properties-keys))
                              #{"alias" "tags"})
-        properties (->> (concat (seq alias-properties)
+        properties (->> (concat (seq tags-properties)
+                                (seq alias-properties)
                                 (seq properties)
                                 class-properties)
                         (util/distinct-by first)
diff --git a/src/main/frontend/handler/db_based/property.cljs b/src/main/frontend/handler/db_based/property.cljs
index 4600384789..607ac55754 100644
--- a/src/main/frontend/handler/db_based/property.cljs
+++ b/src/main/frontend/handler/db_based/property.cljs
@@ -152,17 +152,17 @@
                  (catch :default e
                    (notification/show! (str e) :error false)
                    nil))
-            tags-or-alias? (and (contains? #{"tags" "alias"} k-name) (uuid? v*))]
+            tags-or-alias? (and (contains? #{"tags" "alias"} (string/lower-case k-name)) (uuid? v*))]
         (if tags-or-alias?
           (let [property-value-id (:db/id (db/entity [:block/uuid v*]))
-                attribute (case k-name
+                attribute (case (string/lower-case k-name)
                             "alias"
                             :block/alias
                             "tags"
                             :block/tags)]
             (db/transact! repo
-              [[:db/add (:db/id block) attribute property-value-id]]
-              {:outliner-op :save-block}))
+                          [[:db/add (:db/id block) attribute property-value-id]]
+                          {:outliner-op :save-block}))
           (when-not (contains? (if (set? value) value #{value}) v*)
             (if-let [msg (me/humanize (mu/explain-data schema v*))]
               (let [msg' (str "\"" k-name "\"" " " (if (coll? msg) (first msg) msg))]
@@ -193,11 +193,11 @@
                       refs (outliner-core/rebuild-block-refs block block-properties)]
                   ;; TODO: fix block/properties-order
                   (db/transact! repo
-                    [[:db/retract (:db/id block) :block/refs]
-                     {:block/uuid (:block/uuid block)
-                      :block/properties block-properties
-                      :block/refs refs}]
-                    {:outliner-op :save-block}))))))))))
+                                [[:db/retract (:db/id block) :block/refs]
+                                 {:block/uuid (:block/uuid block)
+                                  :block/properties block-properties
+                                  :block/refs refs}]
+                                {:outliner-op :save-block}))))))))))
 
 (defn- fix-cardinality-many-values!
   [repo property-uuid]