diff --git a/styles/default/template/search.php b/styles/default/template/search.php
index e1e90c16..183ba724 100644
--- a/styles/default/template/search.php
+++ b/styles/default/template/search.php
@@ -38,7 +38,19 @@ function KeywordHighlight($Content)
 			</div>
 			<div class="item-content">
 				<h2>
-					<a href="<?php echo $Config['WebsitePath']; ?>/t/<?php echo $Topic['ID']; ?>"><?php echo KeywordHighlight($Topic['Topic']); ?></a>
+<?php
+if (empty($Topic['PostID'])):
+?>
+					<a href="<?php echo $Config['WebsitePath']; ?>/t/<?php echo $Topic['ID']; ?>">	
+<?php
+else:
+?>
+					<a href="/goto/<?php echo $Topic['ID']; ?>-<?php echo $Topic['PostID']; ?>#Post<?php echo $Topic['PostID']; ?>">
+<?php
+endif
+?>
+						<?php echo KeywordHighlight($Topic['Topic']); ?>
+					</a>
 				</h2>
                 <?php if( isset($Topic['MinContent']) ) { ?>
                 <div class="topic-dec">