diff --git a/doc/fixes37.0 b/doc/fixes37.0
index bd5834ac4..ecae26886 100644
--- a/doc/fixes37.0
+++ b/doc/fixes37.0
@@ -495,6 +495,8 @@ change "killed by <a foo>, while {paralyzed|frozen} by <a foo>" into
 	hero's helplessness
 "It looks very angry" would be given if a hero wielding Excalibur or Demonbane
 	offended an unseen demon lord
+Entering a special room, only wake up the monsters in that room instead of
+	doing a level-wide wake-up
 
 
 Fixes to 3.7.0-x Problems that Were Exposed Via git Repository
diff --git a/src/hack.c b/src/hack.c
index a324726b7..bcec86d9a 100644
--- a/src/hack.c
+++ b/src/hack.c
@@ -2650,6 +2650,9 @@ check_special_room(boolean newlev)
                 for (mtmp = fmon; mtmp; mtmp = mtmp->nmon) {
                     if (DEADMONSTER(mtmp))
                         continue;
+                    if (!isok(mtmp->mx,mtmp->my)
+                        || roomno != levl[mtmp->mx][mtmp->my].roomno)
+                        continue;
                     if (!Stealth && !rn2(3))
                         mtmp->msleeping = 0;
                 }