diff --git a/src/main/frontend/components/cmdk/core.cljs b/src/main/frontend/components/cmdk/core.cljs
index 6c53a90942..5fb8b98be0 100644
--- a/src/main/frontend/components/cmdk/core.cljs
+++ b/src/main/frontend/components/cmdk/core.cljs
@@ -282,7 +282,7 @@
                  result  []]
             (let [[b-cut hl-cut e-cut] (text-util/cut-by content "$pfts_2lqh>$" "$<pfts_2lqh$")
                   hiccups-add [[:span b-cut]
-                               [:mark.p-0.rounded-none hl-cut]]
+                               [:span {:class "ui__list-item-highlighted-span"} hl-cut]]
                   hiccups-add (remove nil? hiccups-add)
                   new-result (concat result hiccups-add)]
               (if-not (string/blank? e-cut)
diff --git a/src/main/frontend/handler/search.cljs b/src/main/frontend/handler/search.cljs
index c9d0eeb638..a3994c5ece 100644
--- a/src/main/frontend/handler/search.cljs
+++ b/src/main/frontend/handler/search.cljs
@@ -135,7 +135,7 @@
             [:div
              (when-not (string/blank? before)
                [:span before])
-             [:mark.p-0.rounded-none (subs content i (+ i (count q)))]
+             [:span {:class "ui__list-item-highlighted-span"} (subs content i (+ i (count q)))]
              (when-not (string/blank? after)
                [:span after])])
           (let [elements (loop [words q-words
@@ -151,7 +151,7 @@
                                         (vec
                                          (concat result
                                                  [[:span (subs content 0 i)]
-                                                  [:mark.p-0.rounded-none (subs content i (+ i (count word)))]])))
+                                                  [:span {:class "ui__list-item-highlighted-span"} (subs content i (+ i (count word)))]])))
                                  (recur nil
                                         content
                                         result)))