diff --git a/mod/display.php b/mod/display.php
index 115feb0ce5..adbe7c6761 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -425,6 +425,12 @@ function display_content(App $a, $update = 0) {
 		if ($title == "") {
 			$title = $author_name;
 		}
+
+		// Limit the description to 160 characters
+		if (strlen($description) > 160) {
+			$description = substr($description, 0, 157) . '...';
+		}
+
 		$description = htmlspecialchars($description, ENT_COMPAT, 'UTF-8', true); // allow double encoding here
 		$title = htmlspecialchars($title, ENT_COMPAT, 'UTF-8', true); // allow double encoding here
 		$author_name = htmlspecialchars($author_name, ENT_COMPAT, 'UTF-8', true); // allow double encoding here