diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java
index 460e97078e..941ecb211e 100644
--- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -14454,6 +14454,10 @@ public class Player extends Playable
 					sendPacket(new ExActivateAutoShortcut(shortcut, true));
 				}
 			}
+			else if (shortcut.getType() == ShortcutType.ACTION)
+			{
+				sendPacket(new ExActivateAutoShortcut(shortcut, true));
+			}
 			else
 			{
 				final Item item = getInventory().getItemByObjectId(shortcut.getId());
@@ -14481,6 +14485,13 @@ public class Player extends Playable
 				continue;
 			}
 			
+			if (shortcut.getType() == ShortcutType.ACTION)
+			{
+				sendPacket(new ExActivateAutoShortcut(shortcut, true));
+				AutoUseTaskManager.getInstance().addAutoAction(this, shortcut.getId());
+				continue;
+			}
+			
 			final Skill knownSkill = getKnownSkill(shortcut.getId());
 			if (knownSkill != null)
 			{
diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java
index 68eaf693e9..84650c6240 100644
--- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -14525,6 +14525,10 @@ public class Player extends Playable
 					sendPacket(new ExActivateAutoShortcut(shortcut, true));
 				}
 			}
+			else if (shortcut.getType() == ShortcutType.ACTION)
+			{
+				sendPacket(new ExActivateAutoShortcut(shortcut, true));
+			}
 			else
 			{
 				final Item item = getInventory().getItemByObjectId(shortcut.getId());
@@ -14552,6 +14556,13 @@ public class Player extends Playable
 				continue;
 			}
 			
+			if (shortcut.getType() == ShortcutType.ACTION)
+			{
+				sendPacket(new ExActivateAutoShortcut(shortcut, true));
+				AutoUseTaskManager.getInstance().addAutoAction(this, shortcut.getId());
+				continue;
+			}
+			
 			final Skill knownSkill = getKnownSkill(shortcut.getId());
 			if (knownSkill != null)
 			{
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java
index 1fc42c4255..9c6134fcb8 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -14563,6 +14563,10 @@ public class Player extends Playable
 					sendPacket(new ExActivateAutoShortcut(shortcut, true));
 				}
 			}
+			else if (shortcut.getType() == ShortcutType.ACTION)
+			{
+				sendPacket(new ExActivateAutoShortcut(shortcut, true));
+			}
 			else
 			{
 				final Item item = getInventory().getItemByObjectId(shortcut.getId());
@@ -14590,6 +14594,13 @@ public class Player extends Playable
 				continue;
 			}
 			
+			if (shortcut.getType() == ShortcutType.ACTION)
+			{
+				sendPacket(new ExActivateAutoShortcut(shortcut, true));
+				AutoUseTaskManager.getInstance().addAutoAction(this, shortcut.getId());
+				continue;
+			}
+			
 			final Skill knownSkill = getKnownSkill(shortcut.getId());
 			if (knownSkill != null)
 			{
diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java
index c3090372a8..702cee6fdc 100644
--- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -14613,6 +14613,10 @@ public class Player extends Playable
 					sendPacket(new ExActivateAutoShortcut(shortcut, true));
 				}
 			}
+			else if (shortcut.getType() == ShortcutType.ACTION)
+			{
+				sendPacket(new ExActivateAutoShortcut(shortcut, true));
+			}
 			else
 			{
 				final Item item = getInventory().getItemByObjectId(shortcut.getId());
@@ -14640,6 +14644,13 @@ public class Player extends Playable
 				continue;
 			}
 			
+			if (shortcut.getType() == ShortcutType.ACTION)
+			{
+				sendPacket(new ExActivateAutoShortcut(shortcut, true));
+				AutoUseTaskManager.getInstance().addAutoAction(this, shortcut.getId());
+				continue;
+			}
+			
 			final Skill knownSkill = getKnownSkill(shortcut.getId());
 			if (knownSkill != null)
 			{
diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java
index 95ae42073c..eb31cb5577 100644
--- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -14641,6 +14641,10 @@ public class Player extends Playable
 					sendPacket(new ExActivateAutoShortcut(shortcut, true));
 				}
 			}
+			else if (shortcut.getType() == ShortcutType.ACTION)
+			{
+				sendPacket(new ExActivateAutoShortcut(shortcut, true));
+			}
 			else
 			{
 				final Item item = getInventory().getItemByObjectId(shortcut.getId());
@@ -14668,6 +14672,13 @@ public class Player extends Playable
 				continue;
 			}
 			
+			if (shortcut.getType() == ShortcutType.ACTION)
+			{
+				sendPacket(new ExActivateAutoShortcut(shortcut, true));
+				AutoUseTaskManager.getInstance().addAutoAction(this, shortcut.getId());
+				continue;
+			}
+			
 			final Skill knownSkill = getKnownSkill(shortcut.getId());
 			if (knownSkill != null)
 			{
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Player.java
index 33e6377758..ba612eae62 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -14366,6 +14366,10 @@ public class Player extends Playable
 					sendPacket(new ExActivateAutoShortcut(shortcut, true));
 				}
 			}
+			else if (shortcut.getType() == ShortcutType.ACTION)
+			{
+				sendPacket(new ExActivateAutoShortcut(shortcut, true));
+			}
 			else
 			{
 				final Item item = getInventory().getItemByObjectId(shortcut.getId());
@@ -14393,6 +14397,13 @@ public class Player extends Playable
 				continue;
 			}
 			
+			if (shortcut.getType() == ShortcutType.ACTION)
+			{
+				sendPacket(new ExActivateAutoShortcut(shortcut, true));
+				AutoUseTaskManager.getInstance().addAutoAction(this, shortcut.getId());
+				continue;
+			}
+			
 			final Skill knownSkill = getKnownSkill(shortcut.getId());
 			if (knownSkill != null)
 			{
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java
index 22750ea487..3bc6b1c0e4 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -14629,6 +14629,10 @@ public class Player extends Playable
 					sendPacket(new ExActivateAutoShortcut(shortcut, true));
 				}
 			}
+			else if (shortcut.getType() == ShortcutType.ACTION)
+			{
+				sendPacket(new ExActivateAutoShortcut(shortcut, true));
+			}
 			else
 			{
 				final Item item = getInventory().getItemByObjectId(shortcut.getId());
@@ -14656,6 +14660,13 @@ public class Player extends Playable
 				continue;
 			}
 			
+			if (shortcut.getType() == ShortcutType.ACTION)
+			{
+				sendPacket(new ExActivateAutoShortcut(shortcut, true));
+				AutoUseTaskManager.getInstance().addAutoAction(this, shortcut.getId());
+				continue;
+			}
+			
 			final Skill knownSkill = getKnownSkill(shortcut.getId());
 			if (knownSkill != null)
 			{
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java
index 0387b97cad..14dd26856b 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -14710,6 +14710,10 @@ public class Player extends Playable
 					sendPacket(new ExActivateAutoShortcut(shortcut, true));
 				}
 			}
+			else if (shortcut.getType() == ShortcutType.ACTION)
+			{
+				sendPacket(new ExActivateAutoShortcut(shortcut, true));
+			}
 			else
 			{
 				final Item item = getInventory().getItemByObjectId(shortcut.getId());
@@ -14737,6 +14741,13 @@ public class Player extends Playable
 				continue;
 			}
 			
+			if (shortcut.getType() == ShortcutType.ACTION)
+			{
+				sendPacket(new ExActivateAutoShortcut(shortcut, true));
+				AutoUseTaskManager.getInstance().addAutoAction(this, shortcut.getId());
+				continue;
+			}
+			
 			final Skill knownSkill = getKnownSkill(shortcut.getId());
 			if (knownSkill != null)
 			{
diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Player.java
index fb20d811f8..79298d1f7d 100644
--- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -14890,6 +14890,10 @@ public class Player extends Playable
 					sendPacket(new ExActivateAutoShortcut(shortcut, true));
 				}
 			}
+			else if (shortcut.getType() == ShortcutType.ACTION)
+			{
+				sendPacket(new ExActivateAutoShortcut(shortcut, true));
+			}
 			else
 			{
 				final Item item = getInventory().getItemByObjectId(shortcut.getId());
@@ -14917,6 +14921,13 @@ public class Player extends Playable
 				continue;
 			}
 			
+			if (shortcut.getType() == ShortcutType.ACTION)
+			{
+				sendPacket(new ExActivateAutoShortcut(shortcut, true));
+				AutoUseTaskManager.getInstance().addAutoAction(this, shortcut.getId());
+				continue;
+			}
+			
 			final Skill knownSkill = getKnownSkill(shortcut.getId());
 			if (knownSkill != null)
 			{
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Player.java
index 94fd45eb4a..e9cc3d158c 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -14979,6 +14979,10 @@ public class Player extends Playable
 					sendPacket(new ExActivateAutoShortcut(shortcut, true));
 				}
 			}
+			else if (shortcut.getType() == ShortcutType.ACTION)
+			{
+				sendPacket(new ExActivateAutoShortcut(shortcut, true));
+			}
 			else
 			{
 				final Item item = getInventory().getItemByObjectId(shortcut.getId());
@@ -15006,6 +15010,13 @@ public class Player extends Playable
 				continue;
 			}
 			
+			if (shortcut.getType() == ShortcutType.ACTION)
+			{
+				sendPacket(new ExActivateAutoShortcut(shortcut, true));
+				AutoUseTaskManager.getInstance().addAutoAction(this, shortcut.getId());
+				continue;
+			}
+			
 			final Skill knownSkill = getKnownSkill(shortcut.getId());
 			if (knownSkill != null)
 			{