diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 96d1cfcf9b..227fbbd1d3 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -109,6 +109,7 @@
 		<li>[Fix] Added missing terms parameter to search pagination. (Bug #34085)</li>
 		<li>[Fix] Wrong table order in query obtaining posts if post id given.</li>
 		<li>[Fix] Do not display reported topic icon for shadow topics. (Bug #13970)</li>
+		<li>[Fix] Display popular topic based on posts within topic instead of replies within topic. (Bug #16099)</li>
 
 		<li>[Change] No longer allow the direct use of MULTI_INSERT in sql_build_array. sql_multi_insert() must be used.</li>
 		<li>[Change] Display warning in ACP if config.php file is left writable.</li>
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index a96fab1caf..ceb1c63c93 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -772,7 +772,8 @@ function topic_status(&$topic_row, $replies, $unread_topic, &$folder_img, &$fold
 				$folder = 'topic_read';
 				$folder_new = 'topic_unread';
 
-				if ($config['hot_threshold'] && $replies >= $config['hot_threshold'] && $topic_row['topic_status'] != ITEM_LOCKED)
+				// Hot topic threshold is for posts in a topic, which is replies + the first post. ;)
+				if ($config['hot_threshold'] && ($replies + 1) >= $config['hot_threshold'] && $topic_row['topic_status'] != ITEM_LOCKED)
 				{
 					$folder .= '_hot';
 					$folder_new .= '_hot';