diff --git a/client/devkit_client/__init__.py b/client/devkit_client/__init__.py
index 53e33ad5fc5efe1edb8f1fbe15afda778ce35b35..820d3a1cc1f6656f2120e1ec4e23c917ef4666cf 100644
--- a/client/devkit_client/__init__.py
+++ b/client/devkit_client/__init__.py
@@ -1332,8 +1332,9 @@ Start-Sleep -Seconds 3
             ['gnome-terminal', '--'],
             ['xterm', '-e'],
         ):
-            if shutil.which(terminal_prefix[0]) is not None:
-                commands = terminal_prefix + commands
+            shell_path = shutil.which(terminal_prefix[0])
+            if shell_path is not None:
+                commands = [ shell_path, ] + terminal_prefix[1:] + commands
                 logger.info(f'Open terminal: {commands!r}')
                 matched = True
                 break