diff --git a/src/hud.rs b/src/hud.rs
index 046d970..75f6c40 100644
--- a/src/hud.rs
+++ b/src/hud.rs
@@ -798,6 +798,8 @@ fn update_poi_overlays (
 fn update_overlay_visibility(
     mut q_marker: Query<&mut Visibility, With<PointOfInterestMarker>>,
     mut q_hudelement: Query<&mut Visibility, (With<ToggleableHudElement>, Without<PointOfInterestMarker>)>,
+    mut q_selectagon: Query<&mut Visibility, (With<Selectagon>, Without<ToggleableHudElement>, Without<PointOfInterestMarker>)>,
+    q_target: Query<&IsTargeted, (Without<Camera>, Without<Selectagon>, Without<PointOfInterestMarker>, Without<ToggleableHudElement>)>,
     mut ambient_light: ResMut<AmbientLight>,
     er_target: EventReader<UpdateOverlayVisibility>,
     settings: Res<var::Settings>,
@@ -810,12 +812,16 @@ fn update_overlay_visibility(
     };
     let show_poi = check(settings.hud_active && settings.map_active);
     let show_hud = check(settings.hud_active);
+    let show_selectagon = check(settings.hud_active && !q_target.is_empty());
     for mut vis in &mut q_marker {
         *vis = show_poi;
     }
     for mut vis in &mut q_hudelement {
         *vis = show_hud;
     }
+    for mut vis in &mut q_selectagon {
+        *vis = show_selectagon;
+    }
 
     ambient_light.brightness = if settings.hud_active {
         AMBIENT_LIGHT_AR