diff --git a/mod/Cyberware.esm b/mod/Cyberware.esm
index 67286c5..015b95b 100644
Binary files a/mod/Cyberware.esm and b/mod/Cyberware.esm differ
diff --git a/src/CWxBionicEyesOnEquip.gek b/src/CWxBionicEyesOnEquip.gek
new file mode 100644
index 0000000..0fb9e9d
--- /dev/null
+++ b/src/CWxBionicEyesOnEquip.gek
@@ -0,0 +1,8 @@
+scn CWxBionicEyesOnEquip
+
+begin function { ref rEquipper, ref rEquipped }
+
+	let CWxBionicEyesQuest.heatShader1stPersonActive := 0
+	let CWxBionicEyesQuest.heatShader3rdPersonActive := 0
+		
+end
diff --git a/src/CWxBionicEyesUpdateTriggers.gek b/src/CWxBionicEyesUpdateTriggers.gek
index dd993d2..ecbed1b 100644
--- a/src/CWxBionicEyesUpdateTriggers.gek
+++ b/src/CWxBionicEyesUpdateTriggers.gek
@@ -8,6 +8,7 @@ begin function { iMode }
 
 		SetOnKeyUpEventHandler CWxBionicEyesOnHotkey 1 CWxVisionModeHotkey
 		SetOnControlDownEventHandler CWxBionicEyesOnHotkey 1 27 ; Grab
+		SetEventHandler "OnActorEquip" CWxBionicEyesOnEquip
 
 		; Clear list of processed actors to reapply shaders
 		if CWxVisionModeLevel > 0
@@ -18,6 +19,7 @@ begin function { iMode }
 	else
 		SetOnKeyUpEventHandler CWxBionicEyesOnHotkey 0 CWxVisionModeHotkey
 		SetOnControlDownEventHandler CWxBionicEyesOnHotkey 0 27 ; Grab
+		RemoveEventHandler "OnActorEquip" CWxBionicEyesOnEquip
 	endif
 
 end