diff --git a/terminus-terminal/src/services/terminal.service.ts b/terminus-terminal/src/services/terminal.service.ts
index 31049e6c..4e21107c 100644
--- a/terminus-terminal/src/services/terminal.service.ts
+++ b/terminus-terminal/src/services/terminal.service.ts
@@ -38,9 +38,9 @@ export class TerminalService {
         if (!cwd) {
             if (this.app.activeTab instanceof TerminalTabComponent && this.app.activeTab.session) {
                 cwd = await this.app.activeTab.session.getWorkingDirectory()
-            } else {
-                cwd = this.config.store.terminal.workingDirectory || null
             }
+            cwd = cwd || this.config.store.terminal.workingDirectory
+            cwd = cwd || null
         }
         if (!shell) {
             let shells = await this.shells$.toPromise()