diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index 5c192d9676..28a2e0b166 100644
--- a/phpBB/includes/constants.php
+++ b/phpBB/includes/constants.php
@@ -182,6 +182,7 @@ define('BBCODE_UID_LEN', 8);
 
 // Number of core BBCodes
 define('NUM_CORE_BBCODES', 12);
+define('NUM_PREDEFINED_BBCODES', 22);
 
 // BBCode IDs
 define('BBCODE_QUOTE_ID', 0);
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index afda10ebee..4726676e2d 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -1076,7 +1076,7 @@ function display_custom_bbcodes()
 	global $db, $template, $user, $phpbb_dispatcher;
 
 	// Start counting from 22 for the bbcode ids (every bbcode takes two ids - opening/closing)
-	$num_predefined_bbcodes = 22;
+	$num_predefined_bbcodes = NUM_PREDEFINED_BBCODES;
 
 	$sql_ary = array(
 		'SELECT'	=> 'b.bbcode_id, b.bbcode_tag, b.bbcode_helpline',