diff --git a/assets/locales.json b/assets/locales.json
index 6269cb5dd..915fb42e5 100644
--- a/assets/locales.json
+++ b/assets/locales.json
@@ -25053,7 +25053,7 @@
         "ar_SA": "",
         "de_DE": "",
         "el_GR": "",
-        "en_US": "Debug (WARNING: For developer use only)",
+        "en_US": "Debug",
         "es_ES": "",
         "fr_FR": "",
         "he_IL": "",
@@ -25073,7 +25073,32 @@
       }
     },
     {
-      "ID": "EnableGDBStub",
+      "ID": "SettingsTabDebugNote",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "WARNING: For developer use only, will reduce performance",
+        "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": "SettingsTabDebugEnableGDBStub",
       "Translations": {
         "ar_SA": "",
         "de_DE": "",
@@ -25098,7 +25123,7 @@
       }
     },
     {
-      "ID": "GDBStubToggleTooltip",
+      "ID": "SettingsTabDebugGDBStubToggleTooltip",
       "Translations": {
         "ar_SA": "",
         "de_DE": "",
@@ -25123,12 +25148,12 @@
       }
     },
     {
-      "ID": "GDBStubPort",
+      "ID": "SettingsTabDebugGDBStubPort",
       "Translations": {
         "ar_SA": "",
         "de_DE": "",
         "el_GR": "",
-        "en_US": "GDB stub port:",
+        "en_US": "GDB Stub Port:",
         "es_ES": "",
         "fr_FR": "",
         "he_IL": "",
@@ -25148,12 +25173,12 @@
       }
     },
     {
-      "ID": "DebuggerSuspendOnStart",
+      "ID": "SettingsTabDebugSuspendOnStart",
       "Translations": {
         "ar_SA": "",
         "de_DE": "",
         "el_GR": "",
-        "en_US": "Suspend application on start",
+        "en_US": "Suspend Application on Start",
         "es_ES": "",
         "fr_FR": "",
         "he_IL": "",
@@ -25173,7 +25198,7 @@
       }
     },
     {
-      "ID": "DebuggerSuspendOnStartTooltip",
+      "ID": "SettingsTabDebugSuspendOnStartTooltip",
       "Translations": {
         "ar_SA": "",
         "de_DE": "",
diff --git a/src/Ryujinx/UI/Views/Settings/SettingsDebugView.axaml b/src/Ryujinx/UI/Views/Settings/SettingsDebugView.axaml
index 036471059..f491dda24 100644
--- a/src/Ryujinx/UI/Views/Settings/SettingsDebugView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsDebugView.axaml
@@ -26,19 +26,21 @@
                 Orientation="Vertical"
                 Spacing="10">
                 <TextBlock Classes="h1" Text="{ext:Locale SettingsTabDebugTitle}" />
+                <TextBlock Foreground="{DynamicResource SecondaryTextColor}" Text="{ext:Locale SettingsTabDebugNote}" />
                 <StackPanel
                     Margin="10,0,0,0"
                     HorizontalAlignment="Stretch"
                     Orientation="Vertical">
                     <CheckBox IsChecked="{Binding EnableGdbStub}">
-                        <TextBlock Text="{ext:Locale EnableGDBStub}"
-                                   ToolTip.Tip="{ext:Locale GDBStubToggleTooltip}" />
+                        <TextBlock Text="{ext:Locale SettingsTabDebugEnableGDBStub}"
+                                   ToolTip.Tip="{ext:Locale SettingsTabDebugGDBStubToggleTooltip}" />
                     </CheckBox>
                 </StackPanel>
                 <StackPanel
+                    Margin="10,0,0,0"
                     Orientation="Horizontal">
                     <TextBlock VerticalAlignment="Center"
-                               Text="{ext:Locale GDBStubPort}"
+                               Text="{ext:Locale SettingsTabDebugGDBStubPort}"
                                Width="250" />
                     <ui:NumberBox Value="{Binding GDBStubPort}"
                                   Width="350"
@@ -54,8 +56,8 @@
                     HorizontalAlignment="Stretch"
                     Orientation="Vertical">
                     <CheckBox IsChecked="{Binding DebuggerSuspendOnStart}">
-                        <TextBlock Text="{ext:Locale DebuggerSuspendOnStart}"
-                                   ToolTip.Tip="{ext:Locale DebuggerSuspendOnStartTooltip}" />
+                        <TextBlock Text="{ext:Locale SettingsTabDebugSuspendOnStart}"
+                                   ToolTip.Tip="{ext:Locale SettingsTabDebugSuspendOnStartTooltip}" />
                     </CheckBox>
                 </StackPanel>
             </StackPanel>