diff --git a/ChangeLog b/ChangeLog
index 08746cb..4677521 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2021-08-18 Riccardo Mottola <rm@gnu.org>
+
+	* PCInfoContronoller.m
+	Center info panel correctly the first time on load.
+
 2021-08-10 Gregory John Casamento <greg.casamento@gmail.com>
 
 	* Framework/PCEditorManager.m: Add method -gotoFile:atLine:
diff --git a/PCInfoController.m b/PCInfoController.m
index fee1c2f..15c15e3 100644
--- a/PCInfoController.m
+++ b/PCInfoController.m
@@ -37,6 +37,13 @@
 
       infoDict = [NSDictionary dictionaryWithContentsOfFile:file];
       RETAIN(infoDict);
+
+      if ([NSBundle loadNibNamed:@"Info" owner:self] == NO)
+	{
+	  return nil;
+	}
+      [versionField setStringValue:[NSString stringWithFormat:@"Version %@", [infoDict objectForKey:@"ApplicationRelease"]]];
+      [infoWindow center];
     }
 
   return self;
@@ -56,29 +63,7 @@
 
 - (void)showInfoWindow:(id)sender
 {
-  if ([NSBundle loadNibNamed:@"Info" owner:self] == NO)
-    {
-//	PCLogError(self, @"error loading Menu NIB file!");
-	return;
-    }
-
   [infoWindow makeKeyAndOrderFront:self];
-  [versionField setStringValue:[NSString stringWithFormat:@"Version %@", [infoDict objectForKey:@"ApplicationRelease"]]];
-		
-/*#if defined(GNUSTEP)
-  if (!infoWindow)
-    {
-      infoWindow = [[GSInfoPanel alloc] initWithDictionary:infoDict];
-    }
-
-  [infoWindow setTitle:@"Info"];
-  [infoWindow center];
-  [infoWindow makeKeyAndOrderFront:self];
-#else
-  NSRunAlertPanel(@"Info",
-		  @"OPENSTEP has no support for GSInfoPanel",
-		  @"OK",nil,nil,nil);
-#endif*/
 }
 
 @end