diff --git a/ChangeLog b/ChangeLog
index 1d06e2b82..3c0cc5447 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-04-10 13:31-EDT Gregory John Casamento <greg_casamento@yahoo.com>
+
+	* Source/NSDrawer.m: Correction for NSDrawer issues with draw
+	temporarily showing up above the window and not syncing with
+	window position.
+
 2009-04-10 10:24-EDT Gregory John Casamento <greg_casamento@yahoo.com>
 
 	* Source/NSAlert.m: in the method _initWithoutGModel add a call
diff --git a/Source/NSDrawer.m b/Source/NSDrawer.m
index 0dae94d38..a3089e7c5 100644
--- a/Source/NSDrawer.m
+++ b/Source/NSDrawer.m
@@ -208,7 +208,7 @@ static NSNotificationCenter *nc = nil;
 
 - (void) startTimer
 {
-  NSTimeInterval time = 2.0;
+  NSTimeInterval time = 1.0;
   _timer = [NSTimer scheduledTimerWithTimeInterval: time
 		    target: self
 		    selector: @selector(_timedWindowReset)
@@ -246,14 +246,14 @@ static NSNotificationCenter *nc = nil;
   // [self setFrame: frame display: YES];
   [self slide];
   [self orderFront: self];
-  // [self startTimer];
+  [self startTimer];
 }
 
 - (void) closeOnEdge
 {
   NSRect frame = [self frameFromParentWindowFrame];
 
-  // [self stopTimer];
+  [self stopTimer];
   [self slide];
   [self setFrame: frame display: YES];
   [self orderOut: self];
@@ -270,7 +270,7 @@ static NSNotificationCenter *nc = nil;
 {
   NSRect frame = [self frame];
   NSRectEdge edge = [_drawer preferredEdge];
-  NSSize size = frame.size; // [_drawer maxContentSize];
+  NSSize size = [_parentWindow frame].size;
 
   [super setParentWindow: nil];
   if (edge == NSMinXEdge) // left
@@ -311,13 +311,13 @@ static NSNotificationCenter *nc = nil;
 
 - (void) handleWindowClose: (NSNotification *)notification
 {
-  // [self stopTimer];
+  [self stopTimer];
   [self close];
 }
 
 - (void) handleWindowMiniaturize: (NSNotification *)notification
 {
-  // [self stopTimer];
+  [self stopTimer];
   [self close];
 }
 
@@ -404,7 +404,7 @@ static NSNotificationCenter *nc = nil;
 
 - (void) dealloc
 {
-  // [self stopTimer];
+  [self stopTimer];
   RELEASE(_parentWindow);
   TEST_RELEASE(_pendingParentWindow);
   [super dealloc];