diff --git a/share/completions/md.fish b/share/completions/md.fish
index 959517f27..fb14ab057 100644
--- a/share/completions/md.fish
+++ b/share/completions/md.fish
@@ -4,7 +4,7 @@ function __md_generate_args --description 'Function to generate args'
     case '/*'
       echo -e '/?\tShow help'
     case '*'
-      wmic logicaldisk get name | tail --lines +2
+      __fish_list_windows_drives
   end
 end
 
diff --git a/share/functions/rd.fish b/share/functions/rd.fish
index 2abc8d5ea..a4e0dd92c 100644
--- a/share/functions/rd.fish
+++ b/share/functions/rd.fish
@@ -2,11 +2,14 @@ function __rd_generate_args --description 'Function to generate args'
   set --local current_token (commandline --current-token --cut-at-cursor)
   switch $current_token
     case '/*'
+      if __fish_seen_argument --windows 's'
+        echo -e '/q\tSpecify quiet mode'
+      end
+
       echo -e '/s\tDelete a directory tree
-/q\tSpecify quiet mode
 /?\tShow help'
     case '*'
-      wmic logicaldisk get name | tail --lines +2
+      __fish_list_windows_drives
   end
 end