diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index f7de6f42c..d4d8f7555 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -1140,8 +1140,9 @@ function mod_move_reply($originBoard, $postID) {
 
 		// build index
 		buildIndex();
+
 		// build new thread
-		buildThread($newID);
+		buildThread($post['op'] ? $newID : $post['thread']);
 		
 		// trigger themes
 		rebuildThemes('post', $targetBoard);
@@ -1159,7 +1160,7 @@ function mod_move_reply($originBoard, $postID) {
 		openBoard($targetBoard);
 
 		// Find new thread on our target board
-		$query = prepare(sprintf('SELECT thread FROM ``posts_%s`` WHERE `id` = :id', $targetBoard));
+		$query = prepare(sprintf('SELECT thread, id FROM ``posts_%s`` WHERE `id` = :id', $targetBoard));
 		$query->bindValue(':id', $newID);
 		$query->execute() or error(db_error($query));
 		$post = $query->fetch(PDO::FETCH_ASSOC);