diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh
index c4c60ec3e1..e15a662550 100755
--- a/git-gui/git-gui.sh
+++ b/git-gui/git-gui.sh
@@ -101,6 +101,9 @@ proc _which {what args} {
 
 	if {[is_Windows] && [lsearch -exact $args -script] >= 0} {
 		set suffix {}
+	} elseif {[string match *$_search_exe $what]} {
+		# The search string already has the file extension
+		set suffix {}
 	} else {
 		set suffix $_search_exe
 	}