diff --git a/lib/browse/BrowseColumns.inc.php b/lib/browse/BrowseColumns.inc.php
index 4b633ff..303c834 100644
--- a/lib/browse/BrowseColumns.inc.php
+++ b/lib/browse/BrowseColumns.inc.php
@@ -107,14 +107,14 @@ class TitleColumn extends BrowseColumn {
 
     function renderFolderLink($aDataRow) {
         $outStr = '<a href="' . $this->buildFolderLink($aDataRow) . '">';
-        $outStr .= $aDataRow["folder"]->getName();
+        $outStr .= htmlentities($aDataRow["folder"]->getName(), ENT_NOQUOTES, 'UTF-8');
         $outStr .= '</a> ';
         return $outStr;
     }
 
     function renderDocumentLink($aDataRow) {
         $outStr = '<a href="' . $this->buildDocumentLink($aDataRow) . '" title="' . $aDataRow["document"]->getFilename().'">';
-        $outStr .= $aDataRow["document"]->getName();
+        $outStr .= htmlentities($aDataRow["document"]->getName(), ENT_NOQUOTES, 'UTF-8');
         $outStr .= '</a>';
         return $outStr;
     }
diff --git a/templates/kt3/standard_page.smarty b/templates/kt3/standard_page.smarty
index 869537b..32772f0 100644
--- a/templates/kt3/standard_page.smarty
+++ b/templates/kt3/standard_page.smarty
@@ -104,9 +104,9 @@
 {if ($page->breadcrumbs !== false)}
   {foreach item=aCrumb from=$page->breadcrumbs name=bc}
      {if ($aCrumb.url) }
-        <a href="{$aCrumb.url}">{$aCrumb.label}</a> 
+        <a href="{$aCrumb.url}">{$aCrumb.label|escape}</a> 
      {else}
-        <span>{$aCrumb.label}</span> 
+        <span>{$aCrumb.label|escape}</span> 
      {/if}
      {if (!$smarty.foreach.bc.last)}
         &raquo;
diff --git a/templates/kt3/view_document.smarty b/templates/kt3/view_document.smarty
index e70d44d..2350ef0 100644
--- a/templates/kt3/view_document.smarty
+++ b/templates/kt3/view_document.smarty
@@ -1,4 +1,4 @@
-<h2>{$document->getName()}</h2>
+<h2>{$document->getName()|escape}</h2>
 {capture assign=version}
 {$document->getMajorVersionNumber()}.{$document->getMinorVersionNumber()}
 {/capture}