diff --git a/webtools/addons/overview.php b/webtools/addons/overview.php
index ab576f519a7..2865ff243c4 100644
--- a/webtools/addons/overview.php
+++ b/webtools/addons/overview.php
@@ -65,6 +65,7 @@ $db->query("
         TM.ID id, 
         TM.Name name, 
         TM.Rating,
+        LEFT(TM.Description,255) as Description,
         TM.downloadcount dc
     FROM
         main TM
diff --git a/webtools/addons/tpl/overview.tpl b/webtools/addons/tpl/overview.tpl
index 9c483d60e49..11061557d0f 100644
--- a/webtools/addons/tpl/overview.tpl
+++ b/webtools/addons/tpl/overview.tpl
@@ -15,7 +15,7 @@
 <ol class="popularlist">
 {section name=new loop=$newest}
 <li>
-<a href="./addon.php?id={$newest[new].ID}">{$newest[new].Name} {$newest[new].Version}</a> ({$newest[new].DateAdded|date_format}) - {$newest[new].Description} ...
+<a href="./addon.php?id={$newest[new].ID}">{$newest[new].Name} {$newest[new].Version}</a> ({$newest[new].DateAdded|date_format}) - {$newest[new].Description|escape} ...
 </li>
 {/section}
 </ol>
@@ -25,7 +25,7 @@
 <ol class="popularlist">
 {section name=pe loop=$popularExtensions}
 <li>
-<a href="./addon.php?id={$popularExtensions[pe].id}">{$popularExtensions[pe].name}</a> <span class="downloads">({$popularExtensions[pe].Rating} rating, {$popularExtensions[pe].dc} downloads)</span> - {$popularExtensions[pe].Description} ...
+<a href="./addon.php?id={$popularExtensions[pe].id}">{$popularExtensions[pe].name}</a> <span class="downloads">({$popularExtensions[pe].Rating} rating, {$popularExtensions[pe].dc} downloads)</span> - {$popularExtensions[pe].Description|escape} ...
 </li>
 {/section}
 </ol>
@@ -34,7 +34,7 @@
 <h2>Popular {$app} Themes</h2>
 <ol class="popularlist">
 {section name=pt loop=$popularThemes}
-<li><a href="./addon.php?id={$popularThemes[pt].id}">{$popularThemes[pt].name}</a> <span class="downloads">({$popularThemes[pt].Rating} rating, {$popularThemes[pt].dc} downloads)</span></li>
+<li><a href="./addon.php?id={$popularThemes[pt].id}">{$popularThemes[pt].name}</a> <span class="downloads">({$popularThemes[pt].Rating} rating, {$popularThemes[pt].dc} downloads)</span> - {$popularThemes[pt].Description|escape} ...</li>
 {/section}
 </ol>
 <p><strong><a href="./search.php?app={$app}&amp;cat=Popular&amp;type=T">More ...</a></strong></p>