diff --git a/src/Collections/CollectionEdit.tsx b/src/Collections/CollectionEdit.tsx
index d22ea9b..b11d7da 100644
--- a/src/Collections/CollectionEdit.tsx
+++ b/src/Collections/CollectionEdit.tsx
@@ -81,12 +81,12 @@ export default function CollectionEdit(props: PropsType) {
       saveErrors.name = fieldRequired;
     }
 
-    if (selectedColor && !color) {
+    if (color && !/^#[0-9a-f]{6}([0-9a-f]{2})?$/i.test(color)) {
       saveErrors.color = "Must be of the form #RRGGBB or #RRGGBBAA or empty";
     }
 
+    setErrors(saveErrors);
     if (Object.keys(saveErrors).length > 0) {
-      setErrors(saveErrors);
       return;
     }