diff --git a/.gitignore b/.gitignore
index fb4d464429c..fa6bed453cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,6 @@ themes/_default-theme.scss
 /vendor
 
 .polymer-qp
+*.iml
+atlassian-ide-plugin.xml
+_default-theme.scss
diff --git a/src/core/style/layout.scss b/src/core/style/layout.scss
index a78d4c618aa..1629d8753d0 100644
--- a/src/core/style/layout.scss
+++ b/src/core/style/layout.scss
@@ -27,6 +27,9 @@
   width: 100%;
 }
 
+[flex-wrap] {
+  flex-wrap: wrap;
+}
 
 // Arrange on the Main Axis
 // center, start, end, space-between, space-around