diff --git a/src/classes/String.php b/src/classes/String.php
index 08cf8f6..98fcae9 100644
--- a/src/classes/String.php
+++ b/src/classes/String.php
@@ -225,11 +225,11 @@ class String
 		{
 			if ($hover == true)
 			{
-				$string = '<span title="' . $string . '">' . substr($string, 0, $length) . '&hellip;</span>';
+				$string = '<span title="' . $string . '">' . mb_strcut($string, 0, $length, 'UTF-8') . '&hellip;</span>';
 			}
 			else
 			{
-				$string = substr($string, 0, $length) . '...';
+				$string = mb_strcut($string, 0, $length, 'UTF-8') . '&hellip;';
 			}
 		}
 
diff --git a/tests/classes/StringTest.php b/tests/classes/StringTest.php
index 6d60eac..0b93eb3 100644
--- a/tests/classes/StringTest.php
+++ b/tests/classes/StringTest.php
@@ -86,7 +86,7 @@ class StringTest extends PHPUnit_Framework_TestCase
 	{
 		return [
 			['foo bar', 3, true,  '<span title="foo bar">foo&hellip;</span>'],
-			['foo bar', 3, false, 'foo...'],
+			['foo bar', 3, false, 'foo&hellip;'],
 			['foo bar', 7, true,  'foo bar'],
 			['foo bar', 8, true,  'foo bar'],
 		];