diff --git a/tabby-core/src/components/splitTab.component.ts b/tabby-core/src/components/splitTab.component.ts
index 8c9414ea..065011a5 100644
--- a/tabby-core/src/components/splitTab.component.ts
+++ b/tabby-core/src/components/splitTab.component.ts
@@ -211,6 +211,11 @@ export class SplitTabComponent extends BaseTabComponent implements AfterViewInit
     /** @hidden */
     _allFocusMode = false
 
+    /**
+     * Disables display of dynamic window/tab title provided by the shell
+     */
+    disableDynamicTitle = false
+
     /** @hidden */
     private focusedTab: BaseTabComponent|null = null
     private maximizedTab: BaseTabComponent|null = null
@@ -748,6 +753,9 @@ export class SplitTabComponent extends BaseTabComponent implements AfterViewInit
     }
 
     private updateTitle (): void {
+        if (this.disableDynamicTitle) {
+            return
+        }
         this.setTitle([...new Set(this.getAllTabs().map(x => x.title))].join(' | '))
     }
 
diff --git a/tabby-settings/src/components/editProfileModal.component.ts b/tabby-settings/src/components/editProfileModal.component.ts
index 97e1aadf..aa950ddf 100644
--- a/tabby-settings/src/components/editProfileModal.component.ts
+++ b/tabby-settings/src/components/editProfileModal.component.ts
@@ -24,7 +24,7 @@ export class EditProfileModalComponent<P extends Profile> {
     @ViewChild('placeholder', { read: ViewContainerRef }) placeholder: ViewContainerRef
 
     private _profile: Profile
-    private settingsComponentInstance: ProfileSettingsComponent<P>
+    private settingsComponentInstance?: ProfileSettingsComponent<P>
 
     constructor (
         private injector: Injector,
@@ -87,7 +87,7 @@ export class EditProfileModalComponent<P extends Profile> {
 
     save () {
         this.profile.group ||= undefined
-        this.settingsComponentInstance.save?.()
+        this.settingsComponentInstance?.save?.()
         this.profile.__cleanup()
         this.modalInstance.close(this._profile)
     }