diff --git a/Source/diablo.cpp b/Source/diablo.cpp
index 859970479..08c38ebea 100644
--- a/Source/diablo.cpp
+++ b/Source/diablo.cpp
@@ -1842,8 +1842,6 @@ void LoadGameLevel(BOOL firstflag, int lvldir)
 					dFlags[i][j] |= BFLAG_LIT;
 			}
 
-			if (!gbVanilla)
-				LoadHotkeys();
 			InitTowners();
 			InitItems();
 			InitMissiles();
diff --git a/Source/player.cpp b/Source/player.cpp
index 71d6387f3..2c08d692f 100644
--- a/Source/player.cpp
+++ b/Source/player.cpp
@@ -988,6 +988,8 @@ void InitPlayer(int pnum, BOOL FirstTime)
 	if (FirstTime) {
 		plr[pnum]._pRSplType = RSPLTYPE_INVALID;
 		plr[pnum]._pRSpell = SPL_INVALID;
+		if (pnum == myplr)
+			LoadHotkeys();
 		plr[pnum]._pSBkSpell = SPL_INVALID;
 		plr[pnum]._pSpell = plr[pnum]._pRSpell;
 		plr[pnum]._pSplType = plr[pnum]._pRSplType;