diff --git a/frontend/src/app/main/ui/workspace/colorpalette.cljs b/frontend/src/app/main/ui/workspace/colorpalette.cljs
index cd9110816..dc384a1f0 100644
--- a/frontend/src/app/main/ui/workspace/colorpalette.cljs
+++ b/frontend/src/app/main/ui/workspace/colorpalette.cljs
@@ -118,7 +118,7 @@
                    :on-close #(swap! state assoc :show-menu false)}
       [:ul.workspace-context-menu.palette-menu
        (for [{:keys [data id] :as library} (vals shared-libs)]
-         (let [colors (-> data :colors vals)]
+         (let [colors (->> data :colors vals (sort-by :name))]
            [:li.palette-library
             {:key (dm/str "library-" id)
              :on-click on-select-palette
@@ -126,7 +126,7 @@
             (when (= selected id) i/tick)
             [:div.library-name (str (:name library) " " (str/ffmt "(%)" (count colors)))]
             [:div.color-sample
-             (for [[i {:keys [color]}] (map-indexed vector (take 7 colors))]
+             (for [[i {:keys [color]}] (map-indexed vector colors)]
                [:& cb/color-bullet {:key (dm/str "color-" i)
                                     :color color}])]]))
 
@@ -139,7 +139,7 @@
                             (tr "workspace.libraries.colors.file-library")
                             (str/ffmt " (%)" (count file-colors)))]
         [:div.color-sample
-         (for [[i color] (map-indexed vector (take 7 (vals file-colors)))]
+         (for [[i color] (map-indexed vector (take 7 (->> (vals file-colors) (sort-by :name))))]
            [:& cb/color-bullet {:key (dm/str "color-" i)
                                 :color color}])]]
 
diff --git a/frontend/src/app/main/ui/workspace/colorpicker/libraries.cljs b/frontend/src/app/main/ui/workspace/colorpicker/libraries.cljs
index f5612f3fc..d5f76a4a3 100644
--- a/frontend/src/app/main/ui/workspace/colorpicker/libraries.cljs
+++ b/frontend/src/app/main/ui/workspace/colorpicker/libraries.cljs
@@ -54,12 +54,13 @@
                      (map #(if (map? %) % {:color %}) (reverse (or recent-colors [])))
 
                      (= @selected :file)
-                     (vals file-colors)
+                     (->> (vals file-colors) (sort-by :name))
 
                      :else ;; Library UUID
                      (as-> @selected file-id
                        (->> (get-in shared-libs [file-id :data :colors])
                             (vals)
+                            (sort-by :name)
                             (map #(assoc % :file-id file-id)))))]
 
         (reset! current-colors (into [] (filter check-valid-color?) colors))))