diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js
index 8211bdd014..6f21dfa6ac 100644
--- a/phpBB/adm/style/ajax.js
+++ b/phpBB/adm/style/ajax.js
@@ -152,7 +152,7 @@ $('[data-ajax]').each(function() {
 * Automatically resize textarea
 */
 $(document).ready(function() {
-	phpbb.resizeTextArea($('textarea'), {minHeight: 75});
+	phpbb.resizeTextArea($('textarea:not(.no-auto-resize)'), {minHeight: 75});
 });
 
 
diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js
index e7dfe95009..2528b96ece 100644
--- a/phpBB/styles/prosilver/template/ajax.js
+++ b/phpBB/styles/prosilver/template/ajax.js
@@ -229,7 +229,7 @@ $('#member_search').click(function () {
 * Automatically resize textarea
 */
 $(document).ready(function() {
-	phpbb.resizeTextArea($('textarea:not(#message-box textarea)'), {minHeight: 75, maxHeight: 250});
+	phpbb.resizeTextArea($('textarea:not(#message-box textarea, .no-auto-resize)'), {minHeight: 75, maxHeight: 250});
 	phpbb.resizeTextArea($('#message-box textarea'));
 });