diff --git a/src/modules/poweraccent/PowerAccent.Core/Languages.cs b/src/modules/poweraccent/PowerAccent.Core/Languages.cs
index 8dd5bfa21c..6a44cdef89 100644
--- a/src/modules/poweraccent/PowerAccent.Core/Languages.cs
+++ b/src/modules/poweraccent/PowerAccent.Core/Languages.cs
@@ -18,6 +18,7 @@ namespace PowerAccent.Core
         GA,
         GD,
         DE,
+        EST,
         FR,
         HR,
         HU,
@@ -52,6 +53,7 @@ namespace PowerAccent.Core
                 Language.GA => GetDefaultLetterKeyGA(letter), // Gaeilge (Irish Gaelic)
                 Language.GD => GetDefaultLetterKeyGD(letter), // Gàidhlig (Scottish Gaelic)
                 Language.DE => GetDefaultLetterKeyDE(letter), // German
+                Language.EST => GetDefaultLetterKeyEST(letter), // Estonian
                 Language.FR => GetDefaultLetterKeyFR(letter), // French
                 Language.HR => GetDefaultLetterKeyHR(letter), // Croatian
                 Language.HU => GetDefaultLetterKeyHU(letter), // Hungarian
@@ -158,6 +160,21 @@ namespace PowerAccent.Core
             };
         }
 
+        // Estonian
+        private static string[] GetDefaultLetterKeyEST(LetterKey letter)
+        {
+            return letter switch
+            {
+                LetterKey.VK_A => new string[] { "ä" },
+                LetterKey.VK_E => new string[] { "€" },
+                LetterKey.VK_O => new string[] { "ö", "õ" },
+                LetterKey.VK_U => new string[] { "ü" },
+                LetterKey.VK_Z => new string[] { "ž" },
+                LetterKey.VK_S => new string[] { "š" },
+                _ => Array.Empty<string>(),
+            };
+        }
+
         // French
         private static string[] GetDefaultLetterKeyFR(LetterKey letter)
         {
diff --git a/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw b/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
index 6f2d0c4cbc..2995397d75 100644
--- a/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
+++ b/src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
@@ -2728,6 +2728,9 @@ Activate by holding the key for the character you want to add an accent to, then
   <data name="QuickAccent_SelectedLanguage_French.Content" xml:space="preserve">
     <value>French</value>
   </data>
+  <data name="QuickAccent_SelectedLanguage_Estonian.Content" xml:space="preserve">
+    <value>Estonian</value>
+  </data>
   <data name="QuickAccent_SelectedLanguage_Macedonian.Content" xml:space="preserve">
     <value>Macedonian</value>
   </data>
@@ -2870,4 +2873,4 @@ Activate by holding the key for the character you want to add an accent to, then
   <data name="TextExtractor_Languages.Header" xml:space="preserve">
     <value>Preferred language</value>
   </data>
-</root>
\ No newline at end of file
+</root>
diff --git a/src/settings-ui/Settings.UI/ViewModels/PowerAccentViewModel.cs b/src/settings-ui/Settings.UI/ViewModels/PowerAccentViewModel.cs
index 528f5aa7a2..05f96c3d45 100644
--- a/src/settings-ui/Settings.UI/ViewModels/PowerAccentViewModel.cs
+++ b/src/settings-ui/Settings.UI/ViewModels/PowerAccentViewModel.cs
@@ -31,6 +31,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             "GA",
             "GD",
             "NL",
+            "EST",
             "FR",
             "DE",
             "HU",
diff --git a/src/settings-ui/Settings.UI/Views/PowerAccentPage.xaml b/src/settings-ui/Settings.UI/Views/PowerAccentPage.xaml
index f6423a4ec0..49223e0e0c 100644
--- a/src/settings-ui/Settings.UI/Views/PowerAccentPage.xaml
+++ b/src/settings-ui/Settings.UI/Views/PowerAccentPage.xaml
@@ -68,6 +68,7 @@
                             <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Gaeilge" />
                             <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Gaidhlig" />
                             <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Dutch" />
+                            <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Estonian" />
                             <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_French" />
                             <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_German" />
                             <ComboBoxItem x:Uid="QuickAccent_SelectedLanguage_Hungarian" />