diff --git a/templates/partials/posts_list.tpl b/templates/partials/posts_list.tpl
index b93dc74..7310fec 100644
--- a/templates/partials/posts_list.tpl
+++ b/templates/partials/posts_list.tpl
@@ -3,7 +3,7 @@
 	<!-- BEGIN posts -->
 	<li component="post" class="posts-list-item row<!-- IF posts.deleted --> deleted<!-- ELSE --><!-- IF posts.topic.deleted --> deleted<!-- ENDIF posts.topic.deleted --><!-- ENDIF posts.deleted -->" data-pid="{posts.pid}" data-uid="{posts.uid}">
 		<div class="col-lg-11 col-sm-10 col-xs-9 post-body">
-			<a class="topic-title" href="{config.relative_path}/topic/{posts.topic.slug}/{posts.index}">
+			<a class="topic-title" href="{config.relative_path}/post/{posts.pid}">
 				<!-- IF !posts.isMainPost -->RE: <!-- ENDIF !posts.isMainPost -->{posts.topic.title}
 			</a>
 
diff --git a/templates/search.tpl b/templates/search.tpl
index 65b7471..faf8226 100644
--- a/templates/search.tpl
+++ b/templates/search.tpl
@@ -147,7 +147,7 @@
 			<div class="topic-row panel panel-default clearfix">
 				<div class="panel-body">
 
-					<a href="{config.relative_path}/topic/{posts.topic.slug}/{posts.index}" class="search-result-text">
+					<a href="{config.relative_path}/post/{posts.pid}" class="search-result-text">
 						<h4>{posts.topic.title}</h4>
 					</a>
 					<!-- IF showAsPosts -->