diff --git a/src/termio/Exec.zig b/src/termio/Exec.zig
index 97702fd3b..1a044c25b 100644
--- a/src/termio/Exec.zig
+++ b/src/termio/Exec.zig
@@ -906,8 +906,8 @@ const Subprocess = struct {
         errdefer arena.deinit();
         const alloc = arena.allocator();
 
-        // Determine the path to the binary we're executing
-        const default_path = switch (builtin.os.tag) {
+        // Determine the shell command we're executing
+        const shell_command = opts.full_config.command orelse switch (builtin.os.tag) {
             .windows => "cmd.exe",
             else => "sh",
         };
@@ -1054,7 +1054,7 @@ const Subprocess = struct {
                 const cmd = try std.fmt.allocPrint(
                     alloc,
                     "exec -l {s}",
-                    .{opts.full_config.command orelse default_path},
+                    .{shell_command},
                 );
 
                 // The reason for executing login this way is unclear. This
@@ -1145,7 +1145,7 @@ const Subprocess = struct {
                 try args.append("-c");
             }
 
-            try args.append(opts.full_config.command orelse default_path);
+            try args.append(shell_command);
             break :args try args.toOwnedSlice();
         };
 
@@ -1165,20 +1165,12 @@ const Subprocess = struct {
                 .zsh => .zsh,
             };
 
-            // We have to get the path to the executing shell. The command
-            // can be a full shell string with arguments so we look for a space
-            // and take the first part.
-            const path = if (opts.full_config.command) |cmd| path: {
-                const idx = std.mem.indexOfScalar(u8, cmd, ' ') orelse cmd.len;
-                break :path cmd[0..idx];
-            } else default_path;
-
             const dir = opts.resources_dir orelse break :shell null;
 
             break :shell try shell_integration.setup(
                 gpa,
                 dir,
-                path,
+                shell_command,
                 &env,
                 force,
                 opts.full_config.@"shell-integration-features",
diff --git a/src/termio/shell_integration.zig b/src/termio/shell_integration.zig
index 8693e7fce..d11d08f70 100644
--- a/src/termio/shell_integration.zig
+++ b/src/termio/shell_integration.zig
@@ -23,7 +23,7 @@ pub const Shell = enum {
 pub fn setup(
     alloc: Allocator,
     resource_dir: []const u8,
-    command_path: []const u8,
+    command: []const u8,
     env: *EnvMap,
     force_shell: ?Shell,
     features: config.ShellIntegrationFeatures,
@@ -31,7 +31,12 @@ pub fn setup(
     const exe = if (force_shell) |shell| switch (shell) {
         .fish => "fish",
         .zsh => "zsh",
-    } else std.fs.path.basename(command_path);
+    } else exe: {
+        // The command can include arguments. Look for the first space
+        // and use the basename of the first part as the command's exe.
+        const idx = std.mem.indexOfScalar(u8, command, ' ') orelse command.len;
+        break :exe std.fs.path.basename(command[0..idx]);
+    };
 
     const shell: Shell = shell: {
         if (std.mem.eql(u8, "fish", exe)) {