diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/UnstableSpell.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/UnstableSpell.java
index 5b25fc174..4661e52c8 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/UnstableSpell.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/UnstableSpell.java
@@ -100,11 +100,11 @@ public class UnstableSpell extends Spell {
 
 		//reroll the scroll until it is relevant for the situation (whether there are visible enemies)
 		if (hero.visibleEnemies() == 0){
-			while (combatScrolls.contains(s.getClass())){
+			while (!nonCombatScrolls.contains(s.getClass())){
 				s = Reflection.newInstance(Random.chances(scrollChances));
 			}
 		} else {
-			while (nonCombatScrolls.contains(s.getClass())){
+			while (!combatScrolls.contains(s.getClass())){
 				s = Reflection.newInstance(Random.chances(scrollChances));
 			}
 		}