3 files changed, 9 insertions, 3 deletions
diff --git a/src/actions/actions.cpp b/src/actions/actions.cpp
index a8d21367e..a4520543c 100644
--- a/src/actions/actions.cpp
+++ b/src/actions/actions.cpp
@@ -807,12 +807,12 @@ impHandler(targetAttack)
                     target = nullptr;
             }
         }
-        if (!target)
+
+        if (!target && !settings.targetingType)
             target = localPlayer->getTarget();
-        // A set target has highest priority
+
         if (!target)
         {
-            // Only auto target Monsters
             target = actorManager->findNearestLivingBeing(
                 localPlayer, 90, ActorType::Monster, AllowSort_true);
         }
diff --git a/src/actions/statusbar.cpp b/src/actions/statusbar.cpp
index 971bfd0f6..331275ba3 100644
--- a/src/actions/statusbar.cpp
+++ b/src/actions/statusbar.cpp
@@ -80,6 +80,11 @@ impHandler0(changeAttackType)
     callYellowBar(changeAttackType);
 }
 
+impHandler0(changeTargetingType)
+{
+    callYellowBar(changeTargetingType);
+}
+
 impHandler0(changeFollowMode)
 {
     callYellowBar(changeFollowMode);
diff --git a/src/actions/statusbar.h b/src/actions/statusbar.h
index 3802a255b..fc304c873 100644
--- a/src/actions/statusbar.h
+++ b/src/actions/statusbar.h
@@ -33,6 +33,7 @@ namespace Actions
     decHandler(changeMoveType);
     decHandler(changeAttackWeaponType);
     decHandler(changeAttackType);
+    decHandler(changeTargetingType);
     decHandler(changeFollowMode);
     decHandler(changeImitationMode);
     decHandler(changeMagicAttackType);