diff --git a/inc/functions.php b/inc/functions.php
index bc6fce45..04340be1 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -361,7 +361,8 @@
 				'post_url' => POST_URL,
 				'index' => ROOT,
 				'id' => $id,
-				'mod' => $mod
+				'mod' => $mod,
+				'return' => ($mod ? '?' . $board['url'] . FILE_INDEX : ROOT . $board['uri'] . '/' . FILE_INDEX)
 			));
 			
 		if($return)
diff --git a/templates/thread.html b/templates/thread.html
index 36dd2b49..e816e127 100644
--- a/templates/thread.html
+++ b/templates/thread.html
@@ -12,7 +12,7 @@
 	<h1>{board[url]} - {board[name]}</h1>
 	<div class="title">{board[title]?{board[title]}}<p>{mod?<a href="?/">Return to dashboard</a>}</p></div>
 	
-	<div class="banner">Posting mode: Reply <a class="unimportant" href="{index}{board[dir]}">[Return.]</a></div>
+	<div class="banner">Posting mode: Reply <a class="unimportant" href="{return}">[Return.]</a></div>
 	<form onsubmit="return dopost(this);" enctype="multipart/form-data" action="{post_url}" method="post">
 	<input type="hidden" name="thread" value="{id}" />
 	<input type="hidden" name="board" value="{board[uri]}" />