diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md
index cf513ecea1d..8f09da06cd1 100644
--- a/.github/CHANGELOG.md
+++ b/.github/CHANGELOG.md
@@ -89,6 +89,7 @@
 1. [A380X/FMS] Fix VLS computation error for CONF 1, might have lead to FMS crashes during climb out - @flogross89 (floridude)
 1. [A380X/FCU] Add correct QFE label using the baro preselect display - @heclak (Heclak)
 1. [FMS] Move the speed limit data to performance data, so that it is flight-plan-specific - @BlueberryKing (BlueberryKing)
+1. [A380X/EFIS] Fix VV pb indicator not turning on when TRK-FPA mode is selected - @heclak (Heclak)
 
 ## 0.12.0
 
diff --git a/fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/model/behaviour/efis-cp.xml b/fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/model/behaviour/efis-cp.xml
index f692bf6dd37..a179c030012 100644
--- a/fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/model/behaviour/efis-cp.xml
+++ b/fbw-a380x/src/base/flybywire-aircraft-a380-842/SimObjects/AirPlanes/FlyByWire_A380_842/model/behaviour/efis-cp.xml
@@ -67,7 +67,8 @@
             <!-- VV -->
             <UseTemplate Name="FBW_A380X_BacklightIndicator_Button_Template">
                 <NODE_ID>PUSH_EFIS_#SIDE_NODE_GROUP#_VV</NODE_ID>
-                <TOGGLE_SIMVAR>L:A380X_EFIS_#SIDE_SIMVAR_GROUP#_VV_BUTTON_IS_ON</TOGGLE_SIMVAR>
+                <BUTTON_CODE>(L:A380X_EFIS_#SIDE_SIMVAR_GROUP#_VV_BUTTON_IS_ON, Boolean) ! (&gt;L:A380X_EFIS_#SIDE_SIMVAR_GROUP#_VV_BUTTON_IS_ON, Boolean)</BUTTON_CODE>
+                <INDICATOR_CODE>(L:A380X_EFIS_#SIDE_SIMVAR_GROUP#_VV_BUTTON_IS_ON) (L:A32NX_TRK_FPA_MODE_ACTIVE) or</INDICATOR_CODE>
                 <TOOLTIPID>TOGGLE VELOCITY VECTOR ON EFIS</TOOLTIPID>
 
                 <NODE_IS_INDICATOR />