diff --git a/terminus-core/src/cli.ts b/terminus-core/src/cli.ts
index 418a312d..75090ca3 100644
--- a/terminus-core/src/cli.ts
+++ b/terminus-core/src/cli.ts
@@ -14,7 +14,8 @@ export class LastCLIHandler extends CLIHandler {
     async handle (event: CLIEvent): Promise<boolean> {
         if (event.secondInstance) {
             this.hostApp.newWindow()
+            return true
         }
-        return true
+        return false
     }
 }
diff --git a/terminus-core/src/services/hostApp.service.ts b/terminus-core/src/services/hostApp.service.ts
index fe0388af..8b9d19fb 100644
--- a/terminus-core/src/services/hostApp.service.ts
+++ b/terminus-core/src/services/hostApp.service.ts
@@ -127,7 +127,8 @@ export class HostAppService {
         })
 
         electron.ipcRenderer.on('cli', (_$event, argv: any, cwd: string, secondInstance: boolean) => this.zone.run(async () => {
-            this.logger.info('CLI arguments received:', argv)
+            const event = { argv, cwd, secondInstance }
+            this.logger.info('CLI arguments received:', event)
 
             const cliHandlers = injector.get(CLIHandler) as unknown as CLIHandler[]
             cliHandlers.sort((a, b) => b.priority - a.priority)
@@ -137,7 +138,8 @@ export class HostAppService {
                 if (handled && handler.firstMatchOnly) {
                     continue
                 }
-                if (await handler.handle({ argv, cwd, secondInstance })) {
+                if (await handler.handle(event)) {
+                    this.logger.info('CLI handler matched:', handler.constructor.name)
                     handled = true
                 }
             }
diff --git a/terminus-core/src/services/hotkeys.util.ts b/terminus-core/src/services/hotkeys.util.ts
index d91ebcdc..6e739172 100644
--- a/terminus-core/src/services/hotkeys.util.ts
+++ b/terminus-core/src/services/hotkeys.util.ts
@@ -70,7 +70,7 @@ export function stringifyKeySequence (events: EventData[]): string[] {
                     Quote: '\'',
                     BracketLeft: '[',
                     BracketRight: ']',
-                }[key] || key
+                }[key] ?? key
             }
 
             itemKeys.push(key)
diff --git a/terminus-terminal/src/services/sessions.service.ts b/terminus-terminal/src/services/sessions.service.ts
index 3824df58..b446cdcf 100644
--- a/terminus-terminal/src/services/sessions.service.ts
+++ b/terminus-terminal/src/services/sessions.service.ts
@@ -190,7 +190,8 @@ export class Session extends BaseSession {
                 })
             }
 
-            let cwd = options.cwd ?? process.env.HOME
+            // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+            let cwd = options.cwd || process.env.HOME
 
             if (!fs.existsSync(cwd)) {
                 console.warn('Ignoring non-existent CWD:', cwd)