diff --git a/src/future.ml b/src/future.ml
index b7732fe8..081e1bc8 100644
--- a/src/future.ml
+++ b/src/future.ml
@@ -198,12 +198,39 @@ module Scheduler = struct
     | None -> s
     | Some (s, _) -> s
 
+  let colorize_prog s =
+    let len = String.length s in
+    if len = 0 then
+      s
+    else begin
+      let rec find_prog_start i =
+        if i < 0 then
+          0
+        else
+          match s.[i] with
+          | '\\' | '/' -> (i + 1)
+          | _ -> find_prog_start (i - 1)
+      in
+      let prog_end =
+        match s.[len - 1] with
+        | '"' -> len - 1
+        | _   -> len
+      in
+      let prog_start = find_prog_start (prog_end - 1) in
+      let prog_end =
+        match String.index_from s prog_start '.' with
+        | exception _ -> prog_end
+        | i -> i
+      in
+      let before = String.sub s ~pos:0 ~len:prog_start in
+      let after = String.sub s ~pos:prog_end ~len:(len - prog_end) in
+      let key = String.sub s ~pos:prog_start ~len:(prog_end - prog_start) in
+      before ^ Ansi_color.colorize ~key key ^ after
+    end
+
   let command_line { prog; args; dir; stdout_to; _ } =
     let quote = quote_for_shell in
-    let prog =
-      let s = quote prog in
-      Ansi_color.colorize ~key:(key_for_color prog) s
-    in
+    let prog = colorize_prog (quote prog) in
     let s = String.concat (prog :: List.map args ~f:quote) ~sep:" " in
     let s =
       match stdout_to with
diff --git a/src/import.ml b/src/import.ml
index a73cdfa2..075a31ee 100644
--- a/src/import.ml
+++ b/src/import.ml
@@ -349,20 +349,24 @@ end
 
 type fail = { fail : 'a. unit -> 'a }
 
-let quote_for_shell s =
+let need_quoting s =
   let len = String.length s in
-  if len = 0 then
+  len = 0 ||
+  let rec loop i =
+    if i = len then
+      false
+    else
+      match s.[i] with
+      | ' ' | '\"' -> true
+      | _ -> loop (i + 1)
+  in
+  loop 0
+
+let quote_for_shell s =
+  if need_quoting s then
     Filename.quote s
   else
-    let rec loop i =
-      if i = len then
-        s
-      else
-        match s.[i] with
-        | ' ' | '\"' -> Filename.quote s
-        | _ -> loop (i + 1)
-    in
-    loop 0
+    s
 
 let suggest_function : (string -> string list -> string list) ref = ref (fun _ _ -> [])