diff --git a/Plugins/README.md b/Plugins/README.md
index 499d17b404..7bd2effdd6 100644
--- a/Plugins/README.md
+++ b/Plugins/README.md
@@ -45,7 +45,7 @@
  - [Read All Notifications Button](https://github.com/mwittrien/BetterDiscordAddons/tree/master/Plugins/ReadAllNotificationsButton) - Adds a Clear Button to the Server List and the Mentions Popout
  - [Remove Blocked Users](https://github.com/mwittrien/BetterDiscordAddons/tree/master/Plugins/RemoveBlockedUsers) - Removes blocked Messages/Users
  - [Remove Nicknames](https://github.com/mwittrien/BetterDiscordAddons/tree/master/Plugins/RemoveNicknames) - Replaces Nicknames with Accountnames
- - [Reveal All Spoilers](https://github.com/mwittrien/BetterDiscordAddons/tree/master/Plugins/RevealAllSpoilers) - Allows you to reveal all Spoilers within a Message/Status by holding the Ctrl Key and clicking a Spoiler
+ - [Reveal All Spoilers](https://github.com/mwittrien/BetterDiscordAddons/tree/master/Plugins/RevealAllSpoilers) - Allows you to reveal all Spoilers in either a Message (Ctrl) or the Chat (Ctrl+Shift) and clicking a Spoiler
  - [Server Counter](https://github.com/mwittrien/BetterDiscordAddons/tree/master/Plugins/ServerCounter) - Adds a Server Counter to the Server List
  - [Server Details](https://github.com/mwittrien/BetterDiscordAddons/tree/master/Plugins/ServerDetails) - Shows Server Details in the Server List Tooltip
  - [Server Folders](https://github.com/mwittrien/BetterDiscordAddons/tree/master/Plugins/ServerFolders) - Changes Discord's Folders, Servers open in a new Container, also adds extra Features to more easily organize, customize and manage your Folders
diff --git a/Plugins/RevealAllSpoilers/README.md b/Plugins/RevealAllSpoilers/README.md
index 7e02c53e8c..34f05141bf 100644
--- a/Plugins/RevealAllSpoilers/README.md
+++ b/Plugins/RevealAllSpoilers/README.md
@@ -12,7 +12,7 @@
 [patreon-badge]: https://img.shields.io/badge/Patreon-%23F96854.svg?style=flat&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAdhwAAHYcBj+XxZQAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAGBSURBVFiF7Za9ThtBFEbPBUpERWMwCorfJjY4aVLxBFHCKyCl4hWQUqVMBULmbfiRCNACqSJsDsXakjHGO8Y7ovFXrmbmO3NnZ74bqrzUeUR8HPP9mdQ60AZawCZQBwK4BC6ADnAUEZeTFhmnsxLjdfVAfXhl/rB66h/1QyUAalu9TzAe1Z26NROAutvf0VvVU7+/CUD9PKP5MMT2VADqhvqvAvOB7tQ1gIXXznpEP4HlxLEpWgH2AEInX0OLv/cUWKwQAKALbKZU4EsGc4AloJ0C8CmD+UDNFIBGRoBGCkAtI8B66i3IpccUgJuMANcpAKcZAc5SAE4yAnRSAA6BXgbzLnBUChARF8DvDAC/IuIqNYzqFYfRrVqDxDCKiL/AV6o5ikdgJyJuBrsrrcBQJX44W0/QVb+NLpoM0B/f6pdwWt2qL3NlWoD+nFV1X/2fYPxg0cCOfdJL+4ESkBqwDTQpQmuNoi2/onjAOsBxRFxPWmTqClSp9w6jOcAcYA7AE1OMk5ulhBZCAAAAAElFTkSuQmCC
 [patreon-link]: https://patreon.com/MircoWittrien
 
-Allows you to reveal all Spoilers within a Message/Status by holding the Ctrl Key and clicking a Spoiler
+Allows you to reveal all Spoilers in either a Message (Ctrl) or the Chat (Ctrl+Shift) and clicking a Spoiler
 
 
 ![cover](https://mwittrien.github.io/BetterDiscordAddons/Plugins/RevealAllSpoilers/_res/cover.gif)
diff --git a/Plugins/RevealAllSpoilers/RevealAllSpoilers.plugin.js b/Plugins/RevealAllSpoilers/RevealAllSpoilers.plugin.js
index e65c7a3fbd..1d6be0a7fe 100644
--- a/Plugins/RevealAllSpoilers/RevealAllSpoilers.plugin.js
+++ b/Plugins/RevealAllSpoilers/RevealAllSpoilers.plugin.js
@@ -2,7 +2,7 @@
  * @name RevealAllSpoilers
  * @author DevilBro
  * @authorId 278543574059057154
- * @version 1.0.8
+ * @version 1.0.9
  * @description Allows you to reveal all Spoilers within a Message/Status by holding the Ctrl Key and clicking a Spoiler
  * @invite Jx3TjNS
  * @donate https://www.paypal.me/MircoWittrien
@@ -17,12 +17,12 @@ module.exports = (_ => {
 		"info": {
 			"name": "RevealAllSpoilers",
 			"author": "DevilBro",
-			"version": "1.0.8",
+			"version": "1.0.9",
 			"description": "Allows you to reveal all Spoilers within a Message/Status by holding the Ctrl Key and clicking a Spoiler"
 		},
 		"changeLog": {
-			"fixed": {
-				"Replies": "No longer reveals spoilers within reply preview if revealing all spoilers within a message."
+			"added": {
+				"Whole Chat": "Hold Ctrl+Shift and click a spoiler to reveal all spoilers in the current message window"
 			}
 		}
 	};
@@ -86,11 +86,11 @@ module.exports = (_ => {
 				BDFDB.PatchUtils.patch(this, e.instance, "revealSpoiler", {after: e2 => {
 					if (e2.methodArguments[0].ctrlKey) {
 						BDFDB.ListenerUtils.stopEvent(e2.methodArguments[0]);
-						let parent = BDFDB.DOMUtils.getParent(BDFDB.dotCN.message, e2.methodArguments[0].target) || e2.methodArguments[0].target.parentElement;
+						let parent = BDFDB.DOMUtils.getParent(e2.methodArguments[0].shiftKey ? BDFDB.dotCN.messageswrapper : BDFDB.dotCN.message, e2.methodArguments[0].target) || e2.methodArguments[0].target.parentElement;
 						if (parent) for (let spoiler of parent.querySelectorAll(BDFDB.dotCN.spoilerhidden)) if (!BDFDB.DOMUtils.getParent(BDFDB.dotCN.messagerepliedmessagepreview, spoiler)) spoiler.click();
 					}
 				}}, {force: true, noCache: true});
 			}
 		};
 	})(window.BDFDB_Global.PluginUtils.buildPlugin(config));
-})();
+})();
\ No newline at end of file