diff --git a/ChangeLog b/ChangeLog
index 7fba089d..13d258d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,16 @@
+2005-07-24 11:20 Gregory John Casamento <greg_casamento@yahoo.com>
+
+	* Palettes/1Windows/GormNSPanel.m
+	* Palettes/1Windows/GormNSWindow.m: Readded override of
+	orderWindow:relativeTo:.  This corrects bug#13838.
+
 2005-07-23 18:02 Gregory John Casamento <greg_casamento@yahoo.com>
 
 	* GormCore/GormInspectorsManager.m: Remove extra revert: call.
 	* GormLib/IBInspector.m: Touch changes the inspector X to the broken
 	X, per specs.
-	* Gorm.m:
+	* Gorm.m: [Gorm testInterface] fix for menu disappearance when
+	testing the interface.
 	* Palettes/0Menus/main.m: Added to authors list.
 
 2005-07-23 10:10 Gregory John Casamento <greg_casamento@yahoo.com>
diff --git a/Gorm.m b/Gorm.m
index fa1620ff..5f39868c 100644
--- a/Gorm.m
+++ b/Gorm.m
@@ -677,9 +677,13 @@
 	      // so we don't get the warning...
 	      [self setServicesMenu: nil]; 
 	      [[self mainMenu] display];
-	      [[NSApp mainWindow] orderFrontRegardless];
+	      [[NSApp mainWindow] makeKeyAndOrderFront: self];
+	      
+	      // we're now in testing mode.
 	      [notifCenter postNotificationName: IBDidBeginTestingInterfaceNotification
 			   object: self];	      
+
+	      [NSApp unhide: self];
 	    }
 
 	  RELEASE(data);
diff --git a/Palettes/1Windows/GormNSPanel.m b/Palettes/1Windows/GormNSPanel.m
index 96112ace..2d27ad1b 100644
--- a/Palettes/1Windows/GormNSPanel.m
+++ b/Palettes/1Windows/GormNSPanel.m
@@ -110,44 +110,22 @@ static unsigned int defaultStyleMask = NSTitledWindowMask | NSClosableWindowMask
   autoPositionMask = mask;
 }
 
-/*
-- (void) sendEvent: (NSEvent*)theEvent
+- (void) orderWindow: (NSWindowOrderingMode)place relativeTo: (int)otherWin
 {
-  NSView	*v;
-  NSEventType	type;
+  id<IBDocuments> document = [(id<IB>)NSApp documentForObject: self];
+  [super orderWindow: place relativeTo: otherWin];
+  if([NSApp isConnecting] == NO)
+    { 
+      id editor = [document editorForObject: self create: NO];
 
-  if (!_f.visible && [theEvent type] != NSAppKitDefined)
-    return;
-
-  if (!_f.cursor_rects_valid)
-    {
-      [self resetCursorRects];
-    }
-
-  type = [theEvent type];
-  switch (type)
-    {
-      case NSLeftMouseDown:
+      // select myself.
+      if([editor respondsToSelector: @selector(selectObjects:)])
 	{
-	  id<IBDocuments> document = [(id<IB>)NSApp documentForObject: self];
-	  if([NSApp isConnecting] == NO)
-	    { 
-	      id editor = [document editorForObject: self create: NO];
-	      
-	      // select myself.
-	      if([editor respondsToSelector: @selector(selectObjects:)])
-		{
-		  [editor selectObjects: [NSArray arrayWithObject: self]];
-		}
-	      
-	      [document setSelectionFromEditor: editor];
-	      [editor makeSelectionVisible: YES];
-	    }
+	  [editor selectObjects: [NSArray arrayWithObject: self]];
 	}
-	break;
-    }
 
-  [super sendEvent: theEvent];
+      [document setSelectionFromEditor: editor];
+      [editor makeSelectionVisible: YES];
+    }
 }
-*/
 @end
diff --git a/Palettes/1Windows/GormNSWindow.m b/Palettes/1Windows/GormNSWindow.m
index d50de28f..0bd4bbc3 100644
--- a/Palettes/1Windows/GormNSWindow.m
+++ b/Palettes/1Windows/GormNSWindow.m
@@ -132,44 +132,22 @@ static unsigned int defaultStyleMask = NSTitledWindowMask | NSClosableWindowMask
   autoPositionMask = mask;
 }
 
-/*
-- (void) sendEvent: (NSEvent*)theEvent
+- (void) orderWindow: (NSWindowOrderingMode)place relativeTo: (int)otherWin
 {
-  NSView	*v;
-  NSEventType	type;
+  id<IBDocuments> document = [(id<IB>)NSApp documentForObject: self];
+  [super orderWindow: place relativeTo: otherWin];
+  if([NSApp isConnecting] == NO)
+    { 
+      id editor = [document editorForObject: self create: NO];
 
-  if (!_f.visible && [theEvent type] != NSAppKitDefined)
-    return;
-
-  if (!_f.cursor_rects_valid)
-    {
-      [self resetCursorRects];
-    }
-
-  type = [theEvent type];
-  switch (type)
-    {
-      case NSLeftMouseDown:
+      // select myself.
+      if([editor respondsToSelector: @selector(selectObjects:)])
 	{
-	  id<IBDocuments> document = [(id<IB>)NSApp documentForObject: self];
-	  if([NSApp isConnecting] == NO)
-	    { 
-	      id editor = [document editorForObject: self create: NO];
-	      
-	      // select myself.
-	      if([editor respondsToSelector: @selector(selectObjects:)])
-		{
-		  [editor selectObjects: [NSArray arrayWithObject: self]];
-		}
-	      
-	      [document setSelectionFromEditor: editor];
-	      [editor makeSelectionVisible: YES];
-	    }
+	  [editor selectObjects: [NSArray arrayWithObject: self]];
 	}
-	break;
-    }
 
-  [super sendEvent: theEvent];
+      [document setSelectionFromEditor: editor];
+      [editor makeSelectionVisible: YES];
+    }
 }
-*/
 @end