diff --git a/build.gradle b/build.gradle
index 233010be..a7683c6a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,6 +22,7 @@ apply from: 'gradle/scripts/propertyloader.gradle'
 apply from: 'gradle/scripts/dependencies.gradle'
 apply from: 'gradle/scripts/artifacts.gradle'
 apply from: 'gradle/scripts/autoinstallruntime.gradle'
+apply from: 'gradle/scripts/integration.gradle'
 
 buildscript {
     repositories {
@@ -103,9 +104,6 @@ sourceSets {
                     "assets/appliedenergistics2/textures/models/*",
                     "assets/appliedenergistics2/textures/items/*"
         }
-
-        // IntelliJ and Gradle interaction bug
-        output.resourcesDir = output.classesDir
     }
 }
 
diff --git a/gradle/scripts/integration.gradle b/gradle/scripts/integration.gradle
new file mode 100644
index 00000000..c96f5316
--- /dev/null
+++ b/gradle/scripts/integration.gradle
@@ -0,0 +1,7 @@
+apply plugin: 'idea'
+
+idea {
+    module {
+        inheritOutputDirs = true
+    }
+}
\ No newline at end of file