diff --git a/CraftingGUI.cs b/CraftingGUI.cs
index 6cf092f5..b4fafa0f 100644
--- a/CraftingGUI.cs
+++ b/CraftingGUI.cs
@@ -506,7 +506,7 @@ private static void DrawCraftButton()
 		{
 			Rectangle dim = InterfaceHelper.GetFullRectangle(craftButton);
 
-			if (Main.netMode == NetmodeID.SinglePlayer && curMouse.X > dim.X && curMouse.X < dim.X + dim.Width && curMouse.Y > dim.Y && curMouse.Y < dim.Y + dim.Height && selectedRecipe != null && Main.mouseItem.IsAir && CanItemBeTakenForTest(selectedRecipe.createItem))
+			if (Main.netMode == NetmodeID.SinglePlayer && curMouse.X > dim.X && curMouse.X < dim.X + dim.Width && curMouse.Y > dim.Y && curMouse.Y < dim.Y + dim.Height && selectedRecipe != null && IsAvailable(selectedRecipe, false) && PassesBlock(selectedRecipe))
 				Main.instance.MouseText(Language.GetText("Mods.MagicStorageExtra.CraftTooltip").Value);
 		}