diff --git a/public/js/layouts.js b/public/js/layouts.js
index 5e5e39be6..1dd128124 100644
--- a/public/js/layouts.js
+++ b/public/js/layouts.js
@@ -92,7 +92,7 @@ const layouts = {
         " "
     ],
     azerty : [
-        "&1","é2","\"3","'4","(5","-6","è7","_8","ç9","à0",")°","=+",
+        "`~","&1","é2","\"3","'4","(5","-6","è7","_8","ç9","à0",")°","=+",
         "aA","zZ","eE","rR","tT","yY","uU","iI","oO","pP","^¨","$£","*µ",
         "qQ","sS","dD","fF","gG","hH","jJ","kK","lL","mM","ù%",
         "wW","xX","cC","vV","bB","nN",",?",";.",":/","!§",
diff --git a/public/js/script.js b/public/js/script.js
index c35e78183..cbd35e20c 100644
--- a/public/js/script.js
+++ b/public/js/script.js
@@ -569,6 +569,9 @@ function addWord() {
   if (config.punctuation && config.mode != "custom") {
     randomWord = punctuateWord(previousWord, randomWord, wordsList.length, 0);
   }
+  if (activeFunBox === "gibberish") {
+    randomWord = getGibberish();
+  }
   wordsList.push(randomWord);
 
   let w = "<div class='word'>";
@@ -661,6 +664,7 @@ function compareInput(showError) {
       if (config.difficulty == "master") {
         if (!resultVisible) {
           inputHistory.push(currentInput);
+          correctedHistory.push(currentCorrected);
           document
             .querySelector("#words .word.active")
             .setAttribute("input", currentInput);
@@ -1992,6 +1996,7 @@ function startTest() {
           hideCaret();
           testActive = false;
           inputHistory.push(currentInput);
+          correctedHistory.push(currentCorrected);
           showResult();
         }
       }