diff --git a/frontend/src/app/main/ui/workspace/tokens/sidebar.cljs b/frontend/src/app/main/ui/workspace/tokens/sidebar.cljs
index edf8eca75..740b24e4a 100644
--- a/frontend/src/app/main/ui/workspace/tokens/sidebar.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/sidebar.cljs
@@ -136,8 +136,8 @@
                {:key (:name token)
                 :token token
                 :theme-token theme-token
-                :half-applied (and applied (not full-applied))
-                ;; Multiple selected shapes behavior should be reviewed after MVP
+                :half-applied (or (and applied multiple-selection)
+                                  (and applied (not full-applied)))
                 :full-applied (if multiple-selection
                                 false
                                 applied)
diff --git a/frontend/src/app/main/ui/workspace/tokens/token_pill.cljs b/frontend/src/app/main/ui/workspace/tokens/token_pill.cljs
index d84f6fa64..92217edf2 100644
--- a/frontend/src/app/main/ui/workspace/tokens/token_pill.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/token_pill.cljs
@@ -30,7 +30,7 @@
                           :else
                           "token-status-non-applied")]
     [:button {:class (stl/css-case :token-pill true
-                                   :token-pill-applied full-applied
+                                   :token-pill-applied (or half-applied full-applied)
                                    :token-pill-invalid errors?
                                    :token-pill-invalid-applied (and full-applied errors?))
               :type "button"