diff --git a/ChangeLog b/ChangeLog
index 6833458c9..78b426e9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-16 Doug Simons <doug.simons@testplant.com>
+
+	* Source/NSDrawer.m:
+	Ensure drawer is visible if parent window became visible since the drawer was opened.
+
 2010-11-13 Riccardo Mottola
 
 	* Images/common_DownloadFolder.tiff
diff --git a/Source/NSDrawer.m b/Source/NSDrawer.m
index 0e4e05c6e..ec2c908c8 100644
--- a/Source/NSDrawer.m
+++ b/Source/NSDrawer.m
@@ -387,6 +387,8 @@ static NSNotificationCenter *nc = nil;
     { 
       NSRect frame = [self frameFromParentWindowFrameInState:[_drawer state]]; 
       [self setFrame: frame display: YES];
+      if (![self isVisible] && [_drawer state] != NSDrawerClosedState)
+        [self orderFront:self];
     }
   if ([self isVisible] && [_parentWindow isKeyWindow]) // do our best to maintain proper window ordering
     {