diff --git a/.gitignore b/.gitignore
index ae3bd7f4de..645707dcfb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,6 +38,7 @@ lib/quasar.jar
 
 # Include the -parameters compiler option by default in IntelliJ required for serialization.
 !.idea/compiler.xml
+!.idea/codeStyleSettings.xml
 
 # if you remove the above rule, at least ignore the following:
 
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
new file mode 100644
index 0000000000..e7e9428374
--- /dev/null
+++ b/.idea/codeStyleSettings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectCodeStyleSettingsManager">
+    <option name="PER_PROJECT_SETTINGS">
+      <value>
+        <JetCodeStyleSettings>
+          <option name="PACKAGES_TO_USE_STAR_IMPORTS">
+            <value>
+              <package name="java.util" withSubpackages="false" static="false" />
+              <package name="kotlinx.android.synthetic" withSubpackages="true" static="false" />
+              <package name="tornadofx" withSubpackages="false" static="false" />
+            </value>
+          </option>
+        </JetCodeStyleSettings>
+      </value>
+    </option>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </component>
+</project>
\ No newline at end of file