diff --git a/jadx-cli/build.gradle b/jadx-cli/build.gradle
index 5271a9a24..4b92b0ae1 100644
--- a/jadx-cli/build.gradle
+++ b/jadx-cli/build.gradle
@@ -19,5 +19,10 @@ applicationDistribution.with {
 }
 
 startScripts {
-    defaultJvmOpts = ['-Xms128M', '-Xmx4g']
+    defaultJvmOpts = ['-Xms128M', '-Xmx4g', '-XX:+UseG1GC']
+    doLast {
+        def str = windowsScript.text
+        str = str.replaceAll('set JAVA_EXE=%JAVA_HOME%/bin/java.exe', 'set JAVA_EXE="%JAVA_HOME%/bin/java.exe"')
+        windowsScript.text = str
+    }
 }
diff --git a/jadx-gui/build.gradle b/jadx-gui/build.gradle
index 6ba64d8fe..26c570dc4 100644
--- a/jadx-gui/build.gradle
+++ b/jadx-gui/build.gradle
@@ -51,8 +51,8 @@ startScripts {
     doLast {
         def str = windowsScript.text
         str = str.replaceAll('java.exe', 'javaw.exe')
-        str = str.replaceAll('"%JAVA_EXE%" %DEFAULT_JVM_OPTS%',
-                'start "jadx-gui" /B "%JAVA_EXE%" %DEFAULT_JVM_OPTS%')
+        str = str.replaceAll('"%JAVA_EXE%" %DEFAULT_JVM_OPTS%', 'start "jadx-gui" /B "%JAVA_EXE%" %DEFAULT_JVM_OPTS%')
+        str = str.replaceAll('set JAVA_EXE=%JAVA_HOME%/bin/javaw.exe', 'set JAVA_EXE="%JAVA_HOME%/bin/javaw.exe"')
         windowsScript.text = str
     }
 }