diff --git a/git-mergetool.sh b/git-mergetool.sh
index e7d745062b..54f6d58a84 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -323,7 +323,7 @@ if test -z "$merge_tool" ; then
         fi
     fi
     regentry="$(REG QUERY 'HKEY_LOCAL_MACHINE\SOFTWARE\KDiff3\diff-ext' 2>/dev/null)" && {
-        KDIFF3=$(echo "$regentry" | grep diffcommand | cut -f 3 | sed -e 's@\\@/@g')
+        KDIFF3=$(echo "$regentry" | grep diffcommand | awk -F 'REG_SZ' '{ print $2 }' | sed -e 's/^ *//'| sed -e 's@\\@/@g')
         KDIFF3SEPARATOR=
         merge_tool_candidates="$merge_tool_candidates kdiff3"
     }