diff --git a/phpBB/assets/javascript/plupload.js b/phpBB/assets/javascript/plupload.js
index c188febc6c..cb86d18f20 100644
--- a/phpBB/assets/javascript/plupload.js
+++ b/phpBB/assets/javascript/plupload.js
@@ -313,7 +313,7 @@ phpbb.plupload.hideEmptyList = function() {
  * @return undefined
  */
 phpbb.plupload.updateBbcode = function(action, index) {
-	var	textarea = $(phpbb.plupload.form).find('textarea[name="message"]'),
+	var	textarea = $('#message', phpbb.plupload.form),
 		text = textarea.val(),
 		removal = (action === 'removal');