diff --git a/tabby-settings/src/components/profilesSettingsTab.component.pug b/tabby-settings/src/components/profilesSettingsTab.component.pug
index f6d60b1a57..9aa25f9520 100644
--- a/tabby-settings/src/components/profilesSettingsTab.component.pug
+++ b/tabby-settings/src/components/profilesSettingsTab.component.pug
@@ -12,14 +12,16 @@ ul.nav-tabs(ngbNav, #nav='ngbNav')
                     [(ngModel)]='config.store.terminal.profile',
                     (ngModelChange)='config.save()',
                 )
-                    option(
-                        *ngFor='let profile of profiles',
-                        [ngValue]='profile.id'
-                    ) {{profile.name}}
-                    option(
-                        *ngFor='let profile of builtinProfiles',
-                        [ngValue]='profile.id'
-                    ) {{profile.name}}
+                    optgroup([label]='"Custom Profiles"|translate')
+                        option(
+                            *ngFor='let profile of customProfiles',
+                            [ngValue]='profile.id'
+                        ) {{profile.name}}
+                    optgroup([label]='"Built-in Profiles"|translate')
+                        option(
+                            *ngFor='let profile of builtinProfiles',
+                            [ngValue]='profile.id'
+                        ) {{profile.name}}
 
             .d-flex.mb-3
                 .input-group
diff --git a/tabby-settings/src/components/profilesSettingsTab.component.ts b/tabby-settings/src/components/profilesSettingsTab.component.ts
index 4bfe2cc47a..e2c0339270 100644
--- a/tabby-settings/src/components/profilesSettingsTab.component.ts
+++ b/tabby-settings/src/components/profilesSettingsTab.component.ts
@@ -21,6 +21,7 @@ interface CollapsableProfileGroup extends ProfileGroup {
 export class ProfilesSettingsTabComponent extends BaseComponent {
     builtinProfiles: PartialProfile<Profile>[] = []
     templateProfiles: PartialProfile<Profile>[] = []
+    customProfiles: PartialProfile<Profile>[] = []
     profileGroups: PartialProfileGroup<CollapsableProfileGroup>[]
     filter = ''
     Platform = Platform
@@ -42,6 +43,7 @@ export class ProfilesSettingsTabComponent extends BaseComponent {
     async ngOnInit (): Promise<void> {
         this.refresh()
         this.builtinProfiles = (await this.profilesService.getProfiles()).filter(x => x.isBuiltin)
+        this.customProfiles = (await this.profilesService.getProfiles()).filter(x => !x.isBuiltin)
         this.templateProfiles = this.builtinProfiles.filter(x => x.isTemplate)
         this.builtinProfiles = this.builtinProfiles.filter(x => !x.isTemplate)
         this.refresh()