diff --git a/.gitignore b/.gitignore
index e7a9b8440fc..a5256ecef4f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,10 +12,6 @@
.classpath
.factorypath
.gradle
-!.idea/
-.idea/*
-!.idea/codeStyles
-!.idea/inspectionProfiles
.metadata
.project
.recommenders
diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 00000000000..f1e07ef8c39
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,10 @@
+.name
+*.xml
+/modules/
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index fda7def5b94..854b5bf0523 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -6,7 +6,7 @@
-
+