diff --git a/src/js/test/test-logic.js b/src/js/test/test-logic.js
index 332cc36ff..b96778235 100644
--- a/src/js/test/test-logic.js
+++ b/src/js/test/test-logic.js
@@ -1240,7 +1240,6 @@ export async function addWord() {
       regenarationCount < 100 &&
       (previousWord == randomWord ||
         previousWord2 == randomWord ||
-        randomWord.indexOf(" ") > -1 ||
         (!Config.punctuation && randomWord == "I"))
     ) {
       regenarationCount++;
@@ -1256,6 +1255,9 @@ export async function addWord() {
     randomWord = LazyMode.replaceAccents(randomWord, language.accents);
   }
 
+  randomWord = randomWord.replace(/ +/gm, " ");
+  randomWord = randomWord.replace(/^ | $/gm, "");
+
   if (Config.funbox === "rAnDoMcAsE") {
     let randomcaseword = "";
     for (let i = 0; i < randomWord.length; i++) {