diff --git a/src/Ryujinx/Assets/Styles/Styles.xaml b/src/Ryujinx/Assets/Styles/Styles.xaml
index d75f140ad..eb40e853c 100644
--- a/src/Ryujinx/Assets/Styles/Styles.xaml
+++ b/src/Ryujinx/Assets/Styles/Styles.xaml
@@ -343,7 +343,7 @@
         <Setter Property="Foreground" Value="SeaGreen"/>
         <Setter Property="Margin" Value="5,0,0,0"/>
         <Setter Property="VerticalAlignment" Value="Center"/>
-        <Setter Property="Text" Value="(Global)"/>  
+        <Setter Property="Text" Value="{ext:Locale GameSpecificConfigurationGlobal}"/>  
     </Style>
     <Style Selector="StackPanel.globalConfigMarker">
     </Style>
diff --git a/src/Ryujinx/Assets/locales.json b/src/Ryujinx/Assets/locales.json
index add007048..272fc01cd 100644
--- a/src/Ryujinx/Assets/locales.json
+++ b/src/Ryujinx/Assets/locales.json
@@ -2748,28 +2748,53 @@
       }
     },
     {
-      "ID": "GameListContextMenuEditGameConfiguration",
+      "ID": "GameListContextMenuCreateCustomConfiguration",
       "Translations": {
-        "ar_SA": "تعديل تكوين اللعبة",
-        "de_DE": "Spielkonfiguration bearbeiten",
-        "el_GR": "Επεξεργασία ρυθμίσεων παιχνιδιού",
-        "en_US": "Edit Game Configuration",
-        "es_ES": "Editar configuración del juego",
-        "fr_FR": "Modifier la configuration du jeu",
-        "he_IL": "ערוך את הגדרת המשחק",
-        "it_IT": "Modifica configurazione gioco",
-        "ja_JP": "ゲーム設定を編集",
-        "ko_KR": "게임 설정 편집",
-        "no_NO": "Rediger spillkonfig.",
-        "pl_PL": "Edytuj konfigurację gry",
-        "pt_BR": "Editar configuração do jogo",
-        "ru_RU": "Редактировать конфигурацию игры",
-        "sv_SE": "Redigera spelkonfiguration",
-        "th_TH": "แก้ไขการตั้งค่าเกม",
-        "tr_TR": "Oyunun yapılandırmasını düzenle",
-        "uk_UA": "Редагувати конфігурацію гри",
-        "zh_CN": "编辑游戏配置",
-        "zh_TW": "編輯遊戲設定"
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "Create Custom Configuration",
+        "es_ES": "",
+        "fr_FR": "",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    },
+    {
+      "ID": "GameListContextMenuEditCustomConfiguration",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "Edit Custom Configuration",
+        "es_ES": "",
+        "fr_FR": "",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
       }
     },
     {
@@ -2798,12 +2823,12 @@
       }
     },
     {
-      "ID": "EditGameConfigurationToolTip",
+      "ID": "CreateCustomConfigurationToolTip",
       "Translations": {
         "ar_SA": "ينشئ تكوينًا مستقلًا للعبة الحالية",
         "de_DE": "Erstellt eine unabhängige Konfiguration für das aktuelle Spiel",
         "el_GR": "Δημιουργεί μια ανεξάρτητη διαμόρφωση για το τρέχον παιχνίδι",
-        "en_US": "Creates an independent configuration for the current game",
+        "en_US": "Creates an independent configuration for the selected game",
         "es_ES": "Crea una configuración independiente para el juego actual",
         "fr_FR": "Crée une configuration indépendante pour le jeu en cours",
         "he_IL": "יוצר תצורה עצמאית למשחק הנוכחי",
@@ -2822,6 +2847,31 @@
         "zh_TW": "為當前遊戲創建獨立的配置"
       }
     },
+    {
+      "ID": "EditCustomConfigurationToolTip",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "Edit your existing independent configuration for the selected game",
+        "es_ES": "",
+        "fr_FR": "",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    },
     {
       "ID": "GameListContextMenuShowCompatEntry",
       "Translations": {
@@ -24123,12 +24173,37 @@
       }
     },
     {
-      "ID": "UserConfigurationHeader",
+      "ID": "GameSpecificConfigurationHeader",
       "Translations": {
         "ar_SA": "",
         "de_DE": "",
         "el_GR": "",
-        "en_US": "User Config",
+        "en_US": "Custom Config",
+        "es_ES": "",
+        "fr_FR": "",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    },
+    {
+      "ID": "GameSpecificConfigurationGlobal",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "(Global)",
         "es_ES": "",
         "fr_FR": "",
         "he_IL": "",
diff --git a/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml b/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml
index 0befd36af..64b30e211 100644
--- a/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml
+++ b/src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml
@@ -19,11 +19,18 @@
         Header="{ext:Locale GameListContextMenuCreateShortcut}"
         Icon="{ext:Icon fa-solid fa-bookmark}"
         ToolTip.Tip="{OnPlatform Default={ext:Locale GameListContextMenuCreateShortcutToolTip}, macOS={ext:Locale GameListContextMenuCreateShortcutToolTipMacOS}}" />
+    <MenuItem
+        Click="EditGameConfiguration_Click"
+        IsVisible="{Binding SelectedApplication.HasIndependentConfiguration}"
+        Header="{ext:Locale GameListContextMenuEditCustomConfiguration}"
+        Icon="{ext:Icon fa-solid fa-gear}"
+        ToolTip.Tip="{ext:Locale EditCustomConfigurationToolTip}" />
     <MenuItem
        Click="EditGameConfiguration_Click"
-       Header="{ext:Locale GameListContextMenuEditGameConfiguration}"
+       IsVisible="{Binding !SelectedApplication.HasIndependentConfiguration}"
+       Header="{ext:Locale GameListContextMenuCreateCustomConfiguration}"
        Icon="{ext:Icon fa-solid fa-gear}"
-       ToolTip.Tip="{ext:Locale EditGameConfigurationToolTip}" />
+       ToolTip.Tip="{ext:Locale CreateCustomConfigurationToolTip}" />
     <MenuItem
         IsVisible="{Binding HasCompatibilityEntry}"
         Click="OpenApplicationCompatibility_Click"
diff --git a/src/Ryujinx/UI/Controls/ApplicationGridView.axaml b/src/Ryujinx/UI/Controls/ApplicationGridView.axaml
index a7b126230..bd20e2969 100644
--- a/src/Ryujinx/UI/Controls/ApplicationGridView.axaml
+++ b/src/Ryujinx/UI/Controls/ApplicationGridView.axaml
@@ -81,7 +81,7 @@
                                             TextWrapping="Wrap" />
                                         <TextBlock
                                             IsVisible="{Binding HasIndependentConfiguration}"
-                                            Text="{ext:Locale UserConfigurationHeader}"
+                                            Text="{ext:Locale GameSpecificConfigurationHeader}"
                                             TextAlignment="Center"
                                             TextWrapping="Wrap"
                                             Foreground="{DynamicResource Warning}" />
@@ -110,7 +110,7 @@
                                 <TextBlock
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{ext:Locale UserConfigurationHeader}"
+                                    Text="{ext:Locale GameSpecificConfigurationHeader}"
                                     TextAlignment="Center"
                                     TextWrapping="Wrap" />
                             </Border>
diff --git a/src/Ryujinx/UI/Controls/ApplicationListView.axaml b/src/Ryujinx/UI/Controls/ApplicationListView.axaml
index 62619913f..5ed7acc20 100644
--- a/src/Ryujinx/UI/Controls/ApplicationListView.axaml
+++ b/src/Ryujinx/UI/Controls/ApplicationListView.axaml
@@ -160,7 +160,7 @@
                                     <TextBlock
                                         HorizontalAlignment="Stretch"
                                         IsVisible="{Binding HasIndependentConfiguration}"
-                                        Text="{ext:Locale UserConfigurationHeader}"
+                                        Text="{ext:Locale GameSpecificConfigurationHeader}"
                                         TextAlignment="Start"
                                         TextWrapping="Wrap"
                                         Foreground="{DynamicResource Warning}" />