diff --git a/modules/board/skins/default/view_document.html b/modules/board/skins/default/view_document.html
index e6b5ca501..878717165 100644
--- a/modules/board/skins/default/view_document.html
+++ b/modules/board/skins/default/view_document.html
@@ -62,7 +62,7 @@
     <th>{$lang->uploaded_file}</th>
     <td>
       <!--@foreach($document->uploaded_list as $key => $file)-->
-        <div><a href="{$file->download_url}"/>{$file->source_filename} ({FileHandler::filesize($file->file_size)})</a> ({number_format($file->download_count)})</div>
+        <div><a href="{$file->download_url}">{$file->source_filename} ({FileHandler::filesize($file->file_size)})</a> ({number_format($file->download_count)})</div>
       <!--@end-->
     </td>
   </tr>
diff --git a/modules/editor/components/multimedia_link/multimedia_link.class.php b/modules/editor/components/multimedia_link/multimedia_link.class.php
index 3f0ebfadb..9b909c115 100644
--- a/modules/editor/components/multimedia_link/multimedia_link.class.php
+++ b/modules/editor/components/multimedia_link/multimedia_link.class.php
@@ -57,7 +57,7 @@
 
             $src = str_replace(array('&','"'), array('&amp;','&qout;'), $src);
 
-            return sprintf("<script type=\"text/javascript\">displayMultimedia(\"%s\", \"%s\",\"%s\",%s);</script>", $src, $width, $height, $auto_start);      
+            return sprintf("<div><script type=\"text/javascript\">displayMultimedia(\"%s\", \"%s\",\"%s\",%s);</script>", $src, $width, $height, $auto_start);      
         }
     }
 ?>