diff --git a/src/Common/Misc/ConvertProxyProperty/index.js b/src/Common/Misc/ConvertProxyProperty/index.js
index e389fc749b..e7f344283c 100644
--- a/src/Common/Misc/ConvertProxyProperty/index.js
+++ b/src/Common/Misc/ConvertProxyProperty/index.js
@@ -131,6 +131,7 @@ export function proxyPropToProp(property, ui) {
       domain: ui.domain || extractDomain(ui),
       componentLabels: [],
       size: extractSize(ui),
+      sort: ui.sort,
     },
     data: {
       id: [property.id, property.name].join(':'),
diff --git a/src/React/Properties/EnumProperty/index.js b/src/React/Properties/EnumProperty/index.js
index 7f6b254e8b..b8f29143df 100644
--- a/src/React/Properties/EnumProperty/index.js
+++ b/src/React/Properties/EnumProperty/index.js
@@ -101,7 +101,12 @@ export default class EnumProperty extends React.Component {
         ret.push(<option key="empty-value" value={null} />);
       }
 
-      Object.keys(this.props.ui.domain).forEach((key) => {
+      const keys = Object.keys(this.props.ui.domain);
+      if (this.props.ui.sort) {
+        keys.sort();
+      }
+
+      keys.forEach((key) => {
         ret.push(
           <option
             value={valueToString(this.props.ui.domain[key])}