diff --git a/library/ajax/view_post.php b/library/ajax/view_post.php
index 163d15b83..ebe73a428 100644
--- a/library/ajax/view_post.php
+++ b/library/ajax/view_post.php
@@ -14,7 +14,7 @@ if (!defined('IN_AJAX')) {
 global $user, $lang;
 
 $post_id = isset($this->request['post_id']) ? (int)$this->request['post_id'] : null;
-$topic_id = (int)$this->request['topic_id'];
+$topic_id = isset($this->request['topic_id']) ? (int)$this->request['topic_id'] : null;
 
 if (is_null($post_id)) {
     $post_id = DB()->fetch_row("SELECT topic_first_post_id FROM " . BB_TOPICS . " WHERE topic_id = $topic_id", 'topic_first_post_id');
diff --git a/styles/templates/default/viewtopic_attach.tpl b/styles/templates/default/viewtopic_attach.tpl
index 3da83d6f0..a4350502e 100644
--- a/styles/templates/default/viewtopic_attach.tpl
+++ b/styles/templates/default/viewtopic_attach.tpl
@@ -169,7 +169,7 @@
 			<p class="small">{postrow.attach.tor_reged.FILESIZE}</p>
 			<p style="padding-top: 6px;"><input id="tor-filelist-btn" type="button" class="lite" value="{L_FILELIST}" /></p>
             <!-- IF postrow.attach.tor_reged.HASH_V2 -->
-            <p><a href="{PAGE_URL}&filelist=1" title = "File hashes | Detailed .torrent meta info" target="_blank">...</a></p>
+            <p><a href="{FULL_URL}viewtopic.php?filelist&t={TOPIC_ID}" title = "File hashes | Detailed .torrent meta info" target="_blank">...</a></p>
             <!-- ENDIF -->
 		</td>
 	</tr>