diff --git a/frontend/src/app/main/ui/workspace/tokens/modals/themes.cljs b/frontend/src/app/main/ui/workspace/tokens/modals/themes.cljs
index c693aae55..6557e5ab7 100644
--- a/frontend/src/app/main/ui/workspace/tokens/modals/themes.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/modals/themes.cljs
@@ -171,13 +171,14 @@
                            :input-props {:ref group-input-ref
                                          :default-value (:group theme)
                                          :on-change on-update-group}
-                           :render-right (mf/fnc []
-                                                 [:button {:class (stl/css :group-drop-down-button)
-                                                           :type "button"
-                                                           :on-click (fn [e]
-                                                                       (dom/stop-propagation e)
-                                                                       (on-toggle-dropdown))}
-                                                  i/arrow])}]]
+                           :render-right (when (seq theme-groups)
+                                           (mf/fnc []
+                                             [:button {:class (stl/css :group-drop-down-button)
+                                                       :type "button"
+                                                       :on-click (fn [e]
+                                                                   (dom/stop-propagation e)
+                                                                   (on-toggle-dropdown))}
+                                              i/arrow]))}]]
        [:& labeled-input {:label "Theme"
                           :input-props {:default-value (:name theme)
                                         :on-change on-update-name}}]]