diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalSettingsPanel.java b/plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalSettingsPanel.java index 1de8201e844bf..bbd7a8e12218c 100644 --- a/plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalSettingsPanel.java +++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalSettingsPanel.java @@ -394,8 +394,10 @@ else if (SystemInfo.isWindows) { if (pwsh != null && StringUtil.startsWithIgnoreCase(pwsh.getAbsolutePath(), "C:\\Program Files\\PowerShell\\")) { shells.add(pwsh.getAbsolutePath()); } - File gitBash = new File("C:\\Program Files\\Git\\bin\\bash.exe"); - if (gitBash.isFile()) { + File gitBashGlobal = new File("C:\\Program Files\\Git\\bin\\bash.exe"); + File gitBashLocal = new File(System.getenv("LocalAppData") + "\\Programs\\Git\\bin\\bash.exe"); + File gitBash = gitBashLocal.isFile() ? gitBashLocal : (gitBashGlobal.isFile() ? gitBashGlobal : null); + if (gitBash != null) { shells.add(gitBash.getAbsolutePath()); } String cmderRoot = EnvironmentUtil.getValue("CMDER_ROOT");