diff --git a/autoload/fugitive.vim b/autoload/fugitive.vim
index 6ec3f6f..6c284ce 100644
--- a/autoload/fugitive.vim
+++ b/autoload/fugitive.vim
@@ -82,7 +82,7 @@ function! s:warn(str) abort
 endfunction
 
 function! s:Slash(path) abort
-  if s:winshell()
+  if exists('+shellslash') && !&shellslash
     return tr(a:path, '\', '/')
   else
     return a:path
diff --git a/plugin/fugitive.vim b/plugin/fugitive.vim
index ef282b7..2b5931f 100644
--- a/plugin/fugitive.vim
+++ b/plugin/fugitive.vim
@@ -205,7 +205,7 @@ function! FugitiveGenerate(...) abort
 endfunction
 
 function! s:Slash(path) abort
-  if &shell =~? 'cmd' || exists('+shellslash') && !&shellslash
+  if exists('+shellslash') && !&shellslash
     return tr(a:path, '\', '/')
   else
     return a:path