diff --git a/tools/Forge/Controller.h b/tools/Forge/Controller.h
index bba9e9250..485e84329 100644
--- a/tools/Forge/Controller.h
+++ b/tools/Forge/Controller.h
@@ -56,12 +56,12 @@
 - (void) applicationWillTerminate: (NSNotification *) not;
 
 // Action methods
-- (void) createNew: (id) sender;
-- (void) createNewProject: (id) sender;
-- (void) infoPanel: (id) sender;
-- (void) open: (id) sender;
-- (void) openProject: (id) sender;
-- (void) saveAll: (id) sender;
-- (void) showPreferencesPanel: (id) sender;
+- (IBAction void) createNew: (id) sender;
+- (IBAction void) createNewProject: (id) sender;
+- (IBAction void) infoPanel: (id) sender;
+- (IBAction void) open: (id) sender;
+- (IBAction void) openProject: (id) sender;
+- (IBAction void) saveAll: (id) sender;
+- (IBAction void) showPreferencesPanel: (id) sender;
 
 @end
diff --git a/tools/Forge/Controller.m b/tools/Forge/Controller.m
index 9e7e0ec71..40ad7fac6 100644
--- a/tools/Forge/Controller.m
+++ b/tools/Forge/Controller.m
@@ -244,6 +244,7 @@ static const char rcsid[] =
 	*/
 	NSDebugLog (@"Windows");
 	windows = [[[NSMenu alloc] init] autorelease];
+	[menu setSubmenu: windows forItem: [menu itemWithTitle: _(@"Windows")]];
 
 	[windows addItemWithTitle: _(@"Close Window")
 					action: @selector (performClose:)
diff --git a/tools/Forge/Forge.classes b/tools/Forge/Forge.classes
index e999c0ff3..e54d79299 100644
--- a/tools/Forge/Forge.classes
+++ b/tools/Forge/Forge.classes
@@ -81,4 +81,4 @@
 	);
 	Super = NSPanel;
     };
-}
+}
\ No newline at end of file
diff --git a/tools/Forge/Forge.gorm b/tools/Forge/Forge.gorm
index 0a589a5fb..c2414c75a 100644
Binary files a/tools/Forge/Forge.gorm and b/tools/Forge/Forge.gorm differ