diff --git a/inventory/group_vars/horizon_all.yml b/inventory/group_vars/horizon_all.yml
index a408537872..a3bae62e42 100644
--- a/inventory/group_vars/horizon_all.yml
+++ b/inventory/group_vars/horizon_all.yml
@@ -24,7 +24,7 @@ horizon_enable_octavia_ui: "{{ (groups['octavia-infra_all'] is defined) and (gro
 # NOTE(mhayden): neutron-lbaas is a separate plugin and requires the full
 # namespace to be specified. Also, LBaaS v1 was removed in Newton.
 horizon_enable_neutron_lbaas: "{{ neutron_plugin_base is defined and 'neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPluginv2' in neutron_plugin_base }}"
-horizon_enable_neutron_fwaas: "{{ neutron_plugin_base is defined and 'firewall' in neutron_plugin_base }}"
+horizon_enable_neutron_fwaas: "{{ neutron_plugin_base is defined and (neutron_plugin_base | intersect(['firewall', 'firewall_v2']) | length > 0) }}"
 horizon_enable_neutron_vpnaas: "{{ neutron_plugin_base is defined and 'vpnaas' in neutron_plugin_base }}"
 horizon_enable_ha_router: "{{ neutron_plugin_type.split('.')[0] == 'ml2' and (groups['neutron_l3_agent'] | length >= 2) }}"
 horizon_rabbitmq_userid: horizon