diff --git a/Source/panels/spell_list.cpp b/Source/panels/spell_list.cpp
index 217ca8089..6801edcff 100644
--- a/Source/panels/spell_list.cpp
+++ b/Source/panels/spell_list.cpp
@@ -57,7 +57,7 @@ bool GetSpellListSelection(SpellID &pSpell, SpellType &pSplType)
 		if (spellListItem.isSelected) {
 			pSpell = spellListItem.id;
 			pSplType = spellListItem.type;
-			if (myPlayer._pClass == HeroClass::Monk && spellListItem.id == SpellID::Search)
+			if (spellListItem.id == GetPlayerStartingLoadoutForClass(myPlayer._pClass).skill)
 				pSplType = SpellType::Skill;
 			return true;
 		}