diff --git a/pkg/commands/oscommands/os_default_platform.go b/pkg/commands/oscommands/os_default_platform.go
index beb767723d6..065d7f29789 100644
--- a/pkg/commands/oscommands/os_default_platform.go
+++ b/pkg/commands/oscommands/os_default_platform.go
@@ -16,7 +16,9 @@ func GetPlatform() *Platform {
 	interactiveShellArg := "-i"
 	interactiveShellExit := "; exit $?"
 
-	if !(strings.HasSuffix(shell, "bash") || strings.HasSuffix(shell, "zsh")) {
+	if strings.HasSuffix(shell, "fish") {
+		interactiveShellExit = "; exit $status"
+	} else if !(strings.HasSuffix(shell, "bash") || strings.HasSuffix(shell, "zsh")) {
 		interactiveShell = "bash"
 		interactiveShellArg = ""
 		interactiveShellExit = ""