diff --git a/docs/modules/Style-manager.md b/docs/modules/Style-manager.md
index 32fb41ff6..9cb9ce7aa 100644
--- a/docs/modules/Style-manager.md
+++ b/docs/modules/Style-manager.md
@@ -14,6 +14,7 @@ Coming soon
 Here you can find all the available built-in properties that you can use inside Style Manager via `buildProps`:
 
 `float`, `position`, `text-align`, `display`, `font-family`, `font-weight`, `border`, `border-style`, `border-color`, `border-width`, `box-shadow`, `background-repeat`, `background-position`, `background-attachment`, `background-size`, `transition`, `transition-duration`, `transition-property`, `transition-timing-function`, `top`, `right`, `bottom`, `left`, `margin`, `margin-top`, `margin-right`, `margin-bottom`, `margin-left`, `padding`, `padding-top`, `padding-right`, `padding-bottom`, `padding-left`, `width`, `heigth`, `min-width`, `min-heigth`, `max-width`, `max-heigth`, `font-size`, `letter-spacing`, `line-height`, `text-shadow`, `border-radius`, `border-top-left-radius`, `border-top-right-radius`, `border-bottom-left-radius`, `border-bottom-right-radius`, `perspective`, `transform`, `transform-rotate-x`, `transform-rotate-y`, `transform-rotate-z`, `transform-scale-x`, `transform-scale-y`, `transform-scale-z`, `color`, `background-color`, `background`, `background-image`, `cursor`
+`overflow`, `overflow-x`, `overflow-y`
 
 Example usage:
 ```js
diff --git a/src/style_manager/model/PropertyFactory.js b/src/style_manager/model/PropertyFactory.js
index e3d690fd0..095c2b2eb 100644
--- a/src/style_manager/model/PropertyFactory.js
+++ b/src/style_manager/model/PropertyFactory.js
@@ -84,6 +84,8 @@ module.exports = () => ({
         case 'transition-timing-function':
         case 'cursor':
         case 'overflow':
+        case 'overflow-x':
+        case 'overflow-y':
           obj.type = 'select';
           break;
         case 'top':
@@ -266,6 +268,8 @@ module.exports = () => ({
           obj.defaults = 'ease';
           break;
         case 'overflow':
+        case 'overflow-x':
+        case 'overflow-y':
           obj.defaults = 'visible';
           break;
       }
@@ -552,6 +556,8 @@ module.exports = () => ({
           ];
           break;
         case 'overflow':
+        case 'overflow-x':
+        case 'overflow-y':
           obj.list = [
             { value: 'visible' },
             { value: 'hidden' },
diff --git a/test/specs/style_manager/model/Models.js b/test/specs/style_manager/model/Models.js
index 9dd0cdb3f..7ce0fad23 100644
--- a/test/specs/style_manager/model/Models.js
+++ b/test/specs/style_manager/model/Models.js
@@ -1032,6 +1032,36 @@ module.exports = {
         };
         expect(obj.build('overflow')).toEqual([res]);
       });
+
+      test('Build overflow-x', () => {
+        var res = {
+          type: 'select',
+          property: 'overflow-x',
+          defaults: 'visible',
+          list: [
+            { value: 'visible' },
+            { value: 'hidden' },
+            { value: 'scroll' },
+            { value: 'auto' }
+          ]
+        };
+        expect(obj.build('overflow-x')).toEqual([res]);
+      });
+
+      test('Build overflow-y', () => {
+        var res = {
+          type: 'select',
+          property: 'overflow-y',
+          defaults: 'visible',
+          list: [
+            { value: 'visible' },
+            { value: 'hidden' },
+            { value: 'scroll' },
+            { value: 'auto' }
+          ]
+        };
+        expect(obj.build('overflow-y')).toEqual([res]);
+      });
     });
   }
 };