diff --git a/windows/git-gui.sh b/windows/git-gui.sh
index 53c3a94686..66bbb2f8fa 100644
--- a/windows/git-gui.sh
+++ b/windows/git-gui.sh
@@ -3,7 +3,12 @@
 exec wish "$0" -- "$@"
 
 if { $argc >=2 && [lindex $argv 0] == "--working-dir" } {
-	cd [lindex $argv 1]
+	set workdir [lindex $argv 1]
+	cd $workdir
+	if {[lindex [file split $workdir] end] eq {.git}} {
+		# Workaround for Explorer right click "Git GUI Here" on .git/
+		cd ..
+	}
 	set argv [lrange $argv 2 end]
 	incr argc -2
 }