diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8ee4f398..1cc0b9bc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Changed
+- Improved French AZERTY layout ([#134])
+
 ### Added
 - German QWERTZ layout without dedicated umlaut keys ([#47])
 
@@ -74,6 +77,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 [#47]: https://github.com/FossifyOrg/Keyboard/issues/47
 [#78]: https://github.com/FossifyOrg/Keyboard/issues/78
+[#134]: https://github.com/FossifyOrg/Keyboard/issues/134
 [#157]: https://github.com/FossifyOrg/Keyboard/issues/157
 [#202]: https://github.com/FossifyOrg/Keyboard/issues/202
 [#222]: https://github.com/FossifyOrg/Keyboard/issues/222
diff --git a/app/src/main/res/xml/keys_letters_french_azerty.xml b/app/src/main/res/xml/keys_letters_french_azerty.xml
index 8a1c8ce2..bd8bf3bc 100644
--- a/app/src/main/res/xml/keys_letters_french_azerty.xml
+++ b/app/src/main/res/xml/keys_letters_french_azerty.xml
@@ -38,7 +38,7 @@
         <Key
             app:keyEdgeFlags="left"
             app:keyLabel="a"
-            app:popupCharacters="1àâæáäãåā"
+            app:popupCharacters="à1âæáäãåā"
             app:popupKeyboard="@xml/keyboard_popup_template"
             app:topSmallNumber="1" />
         <Key
@@ -48,7 +48,7 @@
             app:topSmallNumber="2" />
         <Key
             app:keyLabel="e"
-            app:popupCharacters="éè3êëēęė"
+            app:popupCharacters="è3éêëēęė"
             app:popupKeyboard="@xml/keyboard_popup_template"
             app:topSmallNumber="3" />
         <Key
@@ -68,7 +68,7 @@
             app:topSmallNumber="6" />
         <Key
             app:keyLabel="u"
-            app:popupCharacters="ùû7üúū"
+            app:popupCharacters="û7ùüúū"
             app:popupKeyboard="@xml/keyboard_popup_template"
             app:topSmallNumber="7" />
         <Key