diff --git a/frontend/src/app/main/ui/workspace/tokens/theme_select.cljs b/frontend/src/app/main/ui/workspace/tokens/theme_select.cljs
index 8977dabc1..ff8ed5b7e 100644
--- a/frontend/src/app/main/ui/workspace/tokens/theme_select.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/theme_select.cljs
@@ -28,9 +28,14 @@
            [:li {:key id
                  :class (stl/css-case
                          :checked-element true
+                         :sub-item true
                          :is-selected selected?)}
             [:span {:class (stl/css :label)} name]
-            [:span {:class (stl/css :check-icon)} i/tick]])]])]))
+            [:span {:class (stl/css :check-icon)} i/tick]])]])
+     [:li {:class (stl/css-case :checked-element true
+                                :checked-element-button true)}
+      [:span "Edit themes"]
+      [:span {:class (stl/css :icon)} i/arrow]]]))
 
 (mf/defc theme-select
   [{:keys []}]
diff --git a/frontend/src/app/main/ui/workspace/tokens/theme_select.scss b/frontend/src/app/main/ui/workspace/tokens/theme_select.scss
index 0c97b2721..da8a7b5a3 100644
--- a/frontend/src/app/main/ui/workspace/tokens/theme_select.scss
+++ b/frontend/src/app/main/ui/workspace/tokens/theme_select.scss
@@ -97,11 +97,34 @@
   top: auto;
 }
 
+.sub-item {
+  padding-left: $s-16;
+}
+
+.checked-element-button {
+  @extend .dropdown-element-base;
+  position: relative;
+  display: flex;
+  justify-content: space-between;
+  padding-right: 0;
+}
+
+li + .checked-element-button {
+  margin-top: $s-8;
+  &:before {
+    content: "";
+    position: absolute;
+    top: -$s-4;
+    left: 0;
+    right: 0;
+    height: 1px;
+    background-color: color-mix(in hsl, var(--color-foreground-secondary) 20%, transparent);
+  }
+}
+
 .checked-element {
   @extend .dropdown-element-base;
 
-  padding-left: $s-16;
-
   .icon {
     @include flexCenter;
     height: $s-24;