diff --git a/src/addons/addons/color-picker/paint-editor.js b/src/addons/addons/color-picker/paint-editor.js
index e1256687b..2f403040a 100644
--- a/src/addons/addons/color-picker/paint-editor.js
+++ b/src/addons/addons/color-picker/paint-editor.js
@@ -72,7 +72,7 @@ export default async ({ addon, console, msg }) => {
     const saColorPickerText = Object.assign(document.createElement("input"), {
       className: `sa-color-picker-text sa-color-picker-paint-text ${inputClass}`,
       type: "text",
-      pattern: "^#?([0-9a-fA-F]{3}){1,2}$",
+      pattern: "^#[0-9a-fA-F]{3,8}$",
       placeholder: msg("hex"),
       value: defaultColor || "",
     });
diff --git a/src/addons/libraries/normalize-color.js b/src/addons/libraries/normalize-color.js
index ac928edd9..11fd81740 100644
--- a/src/addons/libraries/normalize-color.js
+++ b/src/addons/libraries/normalize-color.js
@@ -1,4 +1,4 @@
-export const getHexRegex = () => /^#?([0-9a-fA-F]{3}){1,2}$/g;
+export const getHexRegex = () => /^#[0-9a-fA-F]{3,8}$/;
 
 export const normalizeHex = (input) => {
   let hex = String(input);
diff --git a/src/addons/upstream-meta.json b/src/addons/upstream-meta.json
index 86f102f37..a5e2e2b60 100644
--- a/src/addons/upstream-meta.json
+++ b/src/addons/upstream-meta.json
@@ -1 +1 @@
-{"version":"1.12.1","commit":"448768b","languages":["ar","de","en","es","fr","id","it","ja","nl","pl","pt-br","ro","ru","sl","th","tr"]}
\ No newline at end of file
+{"version":"1.12.1","commit":"0faef25","languages":["ar","de","en","es","fr","id","it","ja","nl","pl","pt-br","ro","ru","sl","th","tr"]}
\ No newline at end of file