diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js
index c15a51d959..6238b2c1f2 100644
--- a/phpBB/assets/javascript/core.js
+++ b/phpBB/assets/javascript/core.js
@@ -1233,11 +1233,16 @@ phpbb.applyCodeEditor = function(textarea) {
 };
 
 phpbb.applyDragNDrop = function(textarea) {
-	$('html').on('dragenter dragover', function () {
+	$('body').on('dragenter dragover', function () {
 		$(textarea).addClass('drag-n-drop');
 	}).on('dragleave dragout dragend drop', function() {
 		$(textarea).removeClass('drag-n-drop');
 	});
+	$(textarea).on('dragenter dragover', function () {
+		$(textarea).addClass('drag-n-drop-highlight');
+	}).on('dragleave dragout dragend drop', function() {
+		$(textarea).removeClass('drag-n-drop-highlight');
+	});
 };
 
 /**
diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css
index 0e16bff471..29cf641df2 100644
--- a/phpBB/styles/prosilver/theme/colours.css
+++ b/phpBB/styles/prosilver/theme/colours.css
@@ -978,7 +978,11 @@ fieldset.quick-login input.inputbox {
 }
 
 #message-box textarea.drag-n-drop {
-	outline-color: rgba(17, 163, 234, 0.7);
+	outline-color: rgba(102, 102, 102, 0.5);
+}
+
+#message-box textarea.drag-n-drop-highlight {
+	outline-color: rgba(17, 163, 234, 0.5);
 }
 
 /* Input field styles