diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/InventoryPane.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/InventoryPane.java
index 2d6664a35..3edc3fb51 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/InventoryPane.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/InventoryPane.java
@@ -372,7 +372,9 @@ public class InventoryPane extends Component {
 	}
 
 	public static void useTargeting(){
-		if (lastTarget != null &&
+		if (instance != null &&
+				instance.visible &&
+				lastTarget != null &&
 				Actor.chars().contains( lastTarget ) &&
 				lastTarget.isAlive() &&
 				lastTarget.alignment != Char.Alignment.ALLY &&
@@ -531,6 +533,7 @@ public class InventoryPane extends Component {
 			}
 
 			if (selector == null){
+				targetingSlot = this;
 				RightClickMenu r = new RightClickMenu(item);
 				parent.addToFront(r);
 				r.camera = camera();
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/RightClickMenu.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/RightClickMenu.java
index 53c2e8304..8398ac0ba 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/RightClickMenu.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/RightClickMenu.java
@@ -104,6 +104,10 @@ public class RightClickMenu extends Component {
 					super.onClick();
 					if (item != null){
 						item.execute(Dungeon.hero, options[finalI]);
+
+						if (options[finalI].equals(item.defaultAction) && item.usesTargeting){
+							InventoryPane.useTargeting();
+						}
 					}
 					onSelect(finalI);
 					RightClickMenu.this.destroy();