diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php
index 2d298a4108..1fe9233ba9 100644
--- a/phpBB/includes/mcp/mcp_main.php
+++ b/phpBB/includes/mcp/mcp_main.php
@@ -483,8 +483,17 @@ function mcp_move_topic($topic_ids)
 			$forum_ids[] = $row['forum_id'];
 			add_log('mod', $to_forum_id, $topic_id, 'LOG_MOVE', $row['forum_name']);
 
+			// If we have moved a global announcement, we need to correct the topic type
+			if ($row['topic_type'] == POST_GLOBAL)
+			{
+				$sql = 'UPDATE ' . TOPICS_TABLE . '
+					SET topic_type = ' . POST_ANNOUNCE . '
+					WHERE topic_id = ' . (int) $row['topic_id'];
+				$db->sql_query($sql);
+			}
+
 			// Leave a redirection if required and only if the topic is visible to users
-			if ($leave_shadow && $row['topic_approved'])
+			if ($leave_shadow && $row['topic_approved'] && $row['topic_type'] != POST_GLOBAL)
 			{
 				$shadow = array(
 					'forum_id'				=>	(int) $row['forum_id'],