diff --git a/libraries/joomla/language/language.php b/libraries/joomla/language/language.php
index d5dbebd003d3b..8e87191f965ca 100644
--- a/libraries/joomla/language/language.php
+++ b/libraries/joomla/language/language.php
@@ -577,20 +577,18 @@ public function setLowerLimitSearchWordCallback($function)
 	/**
 	 * Returns an upper limit integer for length of search words
 	 *
-	 * @return  integer  The upper limit integer for length of search words (20 if no value was set for a specific language).
+	 * @return  integer  The upper limit integer for length of search words (200 if no value was set or if default value is < 200).
 	 *
 	 * @since   11.1
 	 */
 	public function getUpperLimitSearchWord()
 	{
-		if ($this->upperLimitSearchWordCallback !== null)
+		if ($this->upperLimitSearchWordCallback !== null && call_user_func($this->upperLimitSearchWordCallback) > 200)
 		{
 			return call_user_func($this->upperLimitSearchWordCallback);
 		}
-		else
-		{
-			return 20;
-		}
+
+		return 200;
 	}
 
 	/**
diff --git a/tests/unit/suites/libraries/joomla/language/JLanguageTest.php b/tests/unit/suites/libraries/joomla/language/JLanguageTest.php
index 86151cf978b99..f90cc7ee7b067 100644
--- a/tests/unit/suites/libraries/joomla/language/JLanguageTest.php
+++ b/tests/unit/suites/libraries/joomla/language/JLanguageTest.php
@@ -558,7 +558,7 @@ public function testGetUpperLimitSearchWord()
 		$lang = new JLanguage('');
 
 		$this->assertEquals(
-			20,
+			200,
 			$lang->getUpperLimitSearchWord(),
 			'Line: ' . __LINE__
 		);