diff --git a/src/editor/config/config.js b/src/editor/config/config.js
index caf576e8e..68e07a2b6 100644
--- a/src/editor/config/config.js
+++ b/src/editor/config/config.js
@@ -217,6 +217,7 @@ module.exports = {
           'float',
           'display',
           'flex-direction',
+          'flex-wrap',
           'position',
           'top',
           'right',
diff --git a/src/style_manager/model/PropertyFactory.js b/src/style_manager/model/PropertyFactory.js
index 1e2a21d05..5d8374b47 100644
--- a/src/style_manager/model/PropertyFactory.js
+++ b/src/style_manager/model/PropertyFactory.js
@@ -73,6 +73,7 @@ module.exports = () => ({
           break;
         case 'display':
         case 'flex-direction':
+        case 'flex-wrap':
         case 'font-family':
         case 'font-weight':
         case 'border-style':
@@ -170,6 +171,9 @@ module.exports = () => ({
         case 'flex-direction':
           obj.defaults = 'row';
           break;
+        case 'flex-wrap':
+          obj.defaults = 'nowrap';
+          break;
         case 'position':
           obj.defaults = 'static';
           break;
@@ -283,6 +287,7 @@ module.exports = () => ({
        */
       switch (prop) {
         case 'flex-direction':
+        case 'flex-wrap':
           obj.requires = { display: ['flex'] };
           break;
       }
@@ -436,6 +441,13 @@ module.exports = () => ({
             { value: 'column-reverse' }
           ];
           break;
+        case 'flex-wrap':
+          obj.list = [
+            { value: 'nowrap' },
+            { value: 'wrap' },
+            { value: 'wrap-reverse' }
+          ];
+          break;
         case 'position':
           obj.list = [
             { value: 'static' },