diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java
index 492773cf2..b138f64ed 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java
@@ -483,7 +483,7 @@ public class Hero extends Char {
 			Dungeon.observe();
 		}
 		
-		if (curAction == null) {
+		if (curAction == null || search(false)) {
 			
 			if (resting) {
 				spend( TIME_TO_REST ); next();
@@ -495,8 +495,6 @@ public class Hero extends Char {
 			
 		} else {
 			
-			search( false );
-			
 			resting = false;
 			
 			ready = false;