diff --git a/src/editor/config/config.js b/src/editor/config/config.js
index 4f5821107..aa2751546 100644
--- a/src/editor/config/config.js
+++ b/src/editor/config/config.js
@@ -234,7 +234,8 @@ module.exports = {
           'align-content',
           'order',
           'flex-grow',
-          'flex-shrink'
+          'flex-shrink',
+          'align-self'
         ]
       },
       {
diff --git a/src/style_manager/model/PropertyFactory.js b/src/style_manager/model/PropertyFactory.js
index 9b11f0e88..8f9314db8 100644
--- a/src/style_manager/model/PropertyFactory.js
+++ b/src/style_manager/model/PropertyFactory.js
@@ -77,6 +77,7 @@ module.exports = () => ({
         case 'justify-content':
         case 'align-items':
         case 'align-content':
+        case 'align-self':
         case 'font-family':
         case 'font-weight':
         case 'border-style':
@@ -189,6 +190,9 @@ module.exports = () => ({
         case 'align-content':
           obj.defaults = 'stretch';
           break;
+        case 'align-self':
+          obj.defaults = 'auto';
+          break;
         case 'position':
           obj.defaults = 'static';
           break;
@@ -314,6 +318,7 @@ module.exports = () => ({
         case 'order':
         case 'flex-grow':
         case 'flex-shrink':
+        case 'align-self':
           obj.requiresParent = { display: ['flex'] };
           break;
       }
@@ -503,6 +508,16 @@ module.exports = () => ({
             { value: 'stretch' }
           ];
           break;
+        case 'align-self':
+          obj.list = [
+            { value: 'auto' },
+            { value: 'flex-start' },
+            { value: 'flex-end' },
+            { value: 'center' },
+            { value: 'baseline' },
+            { value: 'stretch' }
+          ];
+          break;
         case 'position':
           obj.list = [
             { value: 'static' },