diff --git a/README.md b/README.md
index 4fc7214a..f9c4b88f 100755
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 If you can't access the Google doc, here is a [PDF](https://github.com/crnormand/gurps/raw/main/docs/Guide%20for%20GURPS%204e%20on%20Foundry%20VTT.pdf) of the latest version.
 
-# Current Release Version 0.15.20 (compatible with FoundryVTT v10.x)
+# Current Release Version 0.15.21 (compatible with FoundryVTT v10.x)
 
 With support for the [Nordlondr Ovinabokin: Bestiary and Enemies module](https://foundryvtt.com/packages/nordlond-bestiary)!
 
diff --git a/changelog.md b/changelog.md
index 9825fd61..6f8f5640 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,9 @@
 ### [Users Guide](https://bit.ly/2JaSlQd) for GURPS 4e Game Aid for Foundry VTT
 
+Release 0.15.21 01/09/2023
+
+- Fixed removing effect updates modifier window immediately
+
 Release 0.15.20 01/09/2023
 
 - Fixed error when tooltip opens on actor without any user modifiers
diff --git a/module/actor/effect-modifier-control.js b/module/actor/effect-modifier-control.js
index c20ced54..85d82b97 100644
--- a/module/actor/effect-modifier-control.js
+++ b/module/actor/effect-modifier-control.js
@@ -14,7 +14,8 @@ export class EffectModifierControl {
     Hooks.on('getSceneControlButtons', this._createEffectModifierButton.bind(this))
     Hooks.on('controlToken', this._controlToken.bind(this))
     Hooks.on('updateToken', this._updateToken.bind(this))
-    Hooks.on('createActiveEffect', this._createActiveEffect.bind(this))
+    Hooks.on('createActiveEffect', this._updatedActiveEffect.bind(this))
+    Hooks.on('deleteActiveEffect', this._updatedActiveEffect.bind(this))
     Hooks.on('targetToken', this._targetToken.bind(this))
     Hooks.once('ready', () => {
       if (this.shouldUseEffectModifierPopup()) {
@@ -75,10 +76,10 @@ export class EffectModifierControl {
     }
   }
 
-  _createActiveEffect(effect, _, __) {
+  _updatedActiveEffect(effect, _, __) {
     let effectID = effect?.parent.id
     let sharedStateID = this.token?.actor.id
-    console.debug(`_createActiveEffect: effect id: ${effectID}, token actor id: ${sharedStateID}`)
+    console.debug(`updated ActiveEffect: effect id: ${effectID}, token actor id: ${sharedStateID}`)
     if (effect?.parent.id === this.token?.actor.id) this._ui.render(false)
   }
 
diff --git a/system.json b/system.json
index 48dbea95..5899bf4f 100644
--- a/system.json
+++ b/system.json
@@ -2,7 +2,7 @@
   "id": "gurps",
   "title": "GURPS 4e Game Aid (Unofficial)",
   "description": "A game aid to help play GURPS 4e for Foundry VTT",
-  "version": "0.15.20",
+  "version": "0.15.21",
   "authors": [
     {
       "name": "Chris Normand",
@@ -81,7 +81,7 @@
   "secondaryTokenAttribute": "FP",
   "url": "https://github.com/crnormand/gurps",
   "manifest": "https://raw.githubusercontent.com/crnormand/gurps/release/system.json",
-  "download": "https://github.com/crnormand/gurps/archive/0.15.20.zip",
+  "download": "https://github.com/crnormand/gurps/archive/0.15.21.zip",
   "socket": true,
   "license": "LICENSE.txt"
 }
\ No newline at end of file