diff --git a/cli/src/argparse/command.rs b/cli/src/argparse/command.rs
index 45f95e970..1748b86d0 100644
--- a/cli/src/argparse/command.rs
+++ b/cli/src/argparse/command.rs
@@ -20,7 +20,7 @@ impl Command {
                 .file_name()
                 // Convert to string, very unlikely to contain non-UTF8
                 .map(|x| x.to_string_lossy().to_string())
-                .unwrap_or(input.0.to_owned());
+                .unwrap_or_else(|| input.0.to_owned());
 
             let command = Command {
                 command_name,