diff --git a/share/functions/__fish_make_completion_signals.fish b/share/functions/__fish_make_completion_signals.fish
index e32b1e220..e6c0d2bd9 100644
--- a/share/functions/__fish_make_completion_signals.fish
+++ b/share/functions/__fish_make_completion_signals.fish
@@ -6,7 +6,9 @@ function __fish_make_completion_signals --description 'Make list of kill signals
 
     # Cygwin's kill is special, and the documentation lies.
     # Just hardcode the signals.
-    if uname | string match -q 'CYGWIN*'
+    set -l os (uname)
+    if string match -q 'CYGWIN*' -- $os
+        or string match -iq 'Msys' -- $os
         set -a __kill_signals "1 HUP" "2 INT" "3 QUIT" "4 ILL" "5 TRAP" "6 ABRT" \
             "6 IOT" "7 BUS" "8 FPE" "9 KILL" "10 USR1" "11 SEGV" \
             "12 USR2" "13 PIPE" "14 ALRM" "15 TERM" "16 STKFLT" "17 CHLD" \