diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java
index 528aeadf6e..4b4be20c74 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/timers/TimersPlugin.java
@@ -45,6 +45,7 @@ import net.runelite.api.ItemContainer;
 import net.runelite.api.ItemID;
 import static net.runelite.api.ItemID.FIRE_CAPE;
 import static net.runelite.api.ItemID.INFERNAL_CAPE;
+import net.runelite.api.MenuAction;
 import net.runelite.api.NPC;
 import net.runelite.api.NpcID;
 import net.runelite.api.Player;
@@ -439,64 +440,65 @@ public class TimersPlugin extends Plugin
 	@Subscribe
 	public void onMenuOptionClicked(MenuOptionClicked event)
 	{
-		if (config.showStamina()
-			&& event.getMenuOption().contains("Drink")
-			&& (event.getId() == ItemID.STAMINA_MIX1
-			|| event.getId() == ItemID.STAMINA_MIX2
-			|| event.getId() == ItemID.EGNIOL_POTION_1
-			|| event.getId() == ItemID.EGNIOL_POTION_2
-			|| event.getId() == ItemID.EGNIOL_POTION_3
-			|| event.getId() == ItemID.EGNIOL_POTION_4))
+		if (event.isItemOp() && event.getMenuOption().equals("Drink"))
 		{
-			// Needs menu option hook because mixes use a common drink message, distinct from their standard potion messages
-			createStaminaTimer();
-			return;
+			if ((event.getItemId() == ItemID.STAMINA_MIX1
+				|| event.getItemId() == ItemID.STAMINA_MIX2
+				|| event.getItemId() == ItemID.EGNIOL_POTION_1
+				|| event.getItemId() == ItemID.EGNIOL_POTION_2
+				|| event.getItemId() == ItemID.EGNIOL_POTION_3
+				|| event.getItemId() == ItemID.EGNIOL_POTION_4)
+				&& config.showStamina())
+			{
+				// Needs menu option hook because mixes use a common drink message, distinct from their standard potion messages
+				createStaminaTimer();
+				return;
+			}
+
+			if ((event.getItemId() == ItemID.ANTIFIRE_MIX1
+				|| event.getItemId() == ItemID.ANTIFIRE_MIX2)
+				&& config.showAntiFire())
+			{
+				// Needs menu option hook because mixes use a common drink message, distinct from their standard potion messages
+				createGameTimer(ANTIFIRE);
+				return;
+			}
+
+			if ((event.getItemId() == ItemID.EXTENDED_ANTIFIRE_MIX1
+				|| event.getItemId() == ItemID.EXTENDED_ANTIFIRE_MIX2)
+				&& config.showAntiFire())
+			{
+				// Needs menu option hook because mixes use a common drink message, distinct from their standard potion messages
+				createGameTimer(EXANTIFIRE);
+				return;
+			}
+
+			if ((event.getItemId() == ItemID.SUPER_ANTIFIRE_MIX1
+				|| event.getItemId() == ItemID.SUPER_ANTIFIRE_MIX2)
+				&& config.showAntiFire())
+			{
+				// Needs menu option hook because mixes use a common drink message, distinct from their standard potion messages
+				createGameTimer(SUPERANTIFIRE);
+				return;
+			}
+
+			if ((event.getItemId() == ItemID.EXTENDED_SUPER_ANTIFIRE_MIX1
+				|| event.getItemId() == ItemID.EXTENDED_SUPER_ANTIFIRE_MIX2)
+				&& config.showAntiFire())
+			{
+				// Needs menu option hook because mixes use a common drink message, distinct from their standard potion messages
+				createGameTimer(EXSUPERANTIFIRE);
+				return;
+			}
 		}
 
-		if (config.showAntiFire()
-			&& event.getMenuOption().contains("Drink")
-			&& (event.getId() == ItemID.ANTIFIRE_MIX1
-			|| event.getId() == ItemID.ANTIFIRE_MIX2))
+		if (event.getMenuAction() == MenuAction.CC_OP)
 		{
-			// Needs menu option hook because mixes use a common drink message, distinct from their standard potion messages
-			createGameTimer(ANTIFIRE);
-			return;
-		}
-
-		if (config.showAntiFire()
-			&& event.getMenuOption().contains("Drink")
-			&& (event.getId() == ItemID.EXTENDED_ANTIFIRE_MIX1
-			|| event.getId() == ItemID.EXTENDED_ANTIFIRE_MIX2))
-		{
-			// Needs menu option hook because mixes use a common drink message, distinct from their standard potion messages
-			createGameTimer(EXANTIFIRE);
-			return;
-		}
-
-		if (config.showAntiFire()
-			&& event.getMenuOption().contains("Drink")
-			&& (event.getId() == ItemID.SUPER_ANTIFIRE_MIX1
-			|| event.getId() == ItemID.SUPER_ANTIFIRE_MIX2))
-		{
-			// Needs menu option hook because mixes use a common drink message, distinct from their standard potion messages
-			createGameTimer(SUPERANTIFIRE);
-			return;
-		}
-
-		if (config.showAntiFire()
-			&& event.getMenuOption().contains("Drink")
-			&& (event.getId() == ItemID.EXTENDED_SUPER_ANTIFIRE_MIX1
-			|| event.getId() == ItemID.EXTENDED_SUPER_ANTIFIRE_MIX2))
-		{
-			// Needs menu option hook because mixes use a common drink message, distinct from their standard potion messages
-			createGameTimer(EXSUPERANTIFIRE);
-			return;
-		}
-
-		TeleportWidget teleportWidget = TeleportWidget.of(event.getParam1());
-		if (teleportWidget != null)
-		{
-			lastTeleportClicked = teleportWidget;
+			TeleportWidget teleportWidget = TeleportWidget.of(event.getParam1());
+			if (teleportWidget != null)
+			{
+				lastTeleportClicked = teleportWidget;
+			}
 		}
 	}