diff --git a/core/valuesetdef/ValueSetEnumPadded.php b/core/valuesetdef/ValueSetEnumPadded.php
new file mode 100644
index 000000000..2f6f9e075
--- /dev/null
+++ b/core/valuesetdef/ValueSetEnumPadded.php
@@ -0,0 +1,25 @@
+<?php
+
+class ValueSetEnumPadded extends ValueSetEnum
+{
+    /**
+     * @inheritDoc
+     * @since 3.1.0 N°6448 Add $bSortByValues parameter
+     */
+    public function __construct($Values, bool $bSortByValues = false)
+    {
+        parent::__construct($Values, $bSortByValues);
+        if (is_string($Values)) {
+            $this->LoadValues(null);
+        } else {
+            $this->m_aValues = $Values;
+        }
+        $aPaddedValues = array();
+        foreach ($this->m_aValues as $sKey => $sVal) {
+            // Pad keys to the min. length required by the \AttributeSet
+            $sKey = str_pad($sKey, 3, '_', STR_PAD_LEFT);
+            $aPaddedValues[$sKey] = $sVal;
+        }
+        $this->m_values = $aPaddedValues;
+    }
+}
\ No newline at end of file