diff --git a/share/functions/__fish_pwd.fish b/share/functions/__fish_pwd.fish
index 1f8afee81..699eee8d5 100644
--- a/share/functions/__fish_pwd.fish
+++ b/share/functions/__fish_pwd.fish
@@ -1,10 +1,15 @@
 switch (uname)
     case 'CYGWIN_*'
         function __fish_pwd --description "Show current path"
-            pwd | sed -e 's-^/cygdrive/\(.\)/\?-\u\1:/-'
+            if status test-feature regex-easyesc
+                pwd | string replace -r '^/cygdrive/(.)?' '\U$1:'
+            else
+                # TODO: Remove this once regex-easyesc becomes the default
+                pwd | string replace -r '^/cygdrive/(.)?' '\\\U$1:'
+            end
         end
     case '*'
         function __fish_pwd --description "Show current path"
             pwd
         end
-end
\ No newline at end of file
+end