diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 1988646d5b5d..5d9b92f8cb10 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -84,12 +84,16 @@ stdenv.mkDerivation rec {
 
    + (if guiSupport then ''
        # Wrap Tcl/Tk programs
-       for prog in bin/gitk libexec/git-core/git-gui
-       do
+       for prog in bin/gitk; do
          wrapProgram "$out/$prog"                       \
                      --set TK_LIBRARY "${tk}/lib/${tk.libPrefix}" \
                      --prefix PATH : "${tk}/bin"
        done
+       for prog in git-gui git-citool git-gui--askpass; do
+         sed -i -e "s|exec 'wish'|exec '${tk}/bin/wish'|g" \
+                -e "s|exec wish|exec '${tk}/bin/wish'|g" \
+		"$out/libexec/git-core/$prog"
+       done
      '' else ''
       # Don't wrap Tcl/Tk, replace them by notification scripts
        for prog in bin/gitk libexec/git-core/git-gui