diff --git a/Double-click-to-edit/DoubleClickToEdit.plugin.js b/Double-click-to-edit/DoubleClickToEdit.plugin.js
index 4656c64..c0512c4 100644
--- a/Double-click-to-edit/DoubleClickToEdit.plugin.js
+++ b/Double-click-to-edit/DoubleClickToEdit.plugin.js
@@ -220,8 +220,14 @@ module.exports = class DoubleClickToEdit {
 			return;
 
 		//Target the message
-		const messageDiv = e.target.closest('li > [class^=message]');
-
+		const messageDiv = e.target.closest(
+			'[data-list-item-id^="chat-messages"], ' +
+			'article[class*="message"], ' +
+			'div[class*="messageContainer"], ' +
+			'li > div[class*="message"], ' +
+			'li[class*="message"]'
+		);
+		
 		//If it finds nothing, null it.
 		if (!messageDiv)
 			return;