diff --git a/templates/kt3/fieldsets/generic.smarty b/templates/kt3/fieldsets/generic.smarty
index 2e48623..f34c37b 100644
--- a/templates/kt3/fieldsets/generic.smarty
+++ b/templates/kt3/fieldsets/generic.smarty
@@ -8,7 +8,7 @@
     <table class="metadatatable" cellspacing="0" cellpadding="5">
     <tr class="even first">
         <th>{i18n}Document Filename{/i18n}</th>
-        <td>{$filename} ({$context->_sizeHelper($document->getSize())})</td>
+        <td>{$filename|wordwrap:40:"\n":true} ({$context->_sizeHelper($document->getSize())})</td>
     </tr>
     
     <tr class="odd">
diff --git a/templates/ktcore/document/view.smarty b/templates/ktcore/document/view.smarty
index 2d48adf..11402fa 100644
--- a/templates/ktcore/document/view.smarty
+++ b/templates/ktcore/document/view.smarty
@@ -1,4 +1,4 @@
-<h2><img src="{$rootUrl}/resources/graphics/title_bullet.png"/>{$document->getName()|escape|truncate:40:"..."}</h2>
+<h2><img src="{$rootUrl}/resources/graphics/title_bullet.png"/>{$document->getName()|escape|wordwrap:40:"\n":true}</h2>
 
 {if ($document->getIsCheckedOut() == 1)}
 {capture assign=checkout_user}<strong>{$sCheckoutUser}</strong>{/capture}