diff --git a/macosx/ActionPopUpButton.m b/macosx/ActionPopUpButton.m
index 7c9bd4551..b50e5fc49 100644
--- a/macosx/ActionPopUpButton.m
+++ b/macosx/ActionPopUpButton.m
@@ -3,11 +3,6 @@
 
 @implementation ActionPopUpButton
 
-+ (Class) cellClass
-{
-	return [ActionPopUpButtonCell class];
-}
-
 - (id) initWithCoder: (NSCoder *) coder
 {
 	if (self = [super initWithCoder: coder])
diff --git a/macosx/ActionPopUpButtonCell.m b/macosx/ActionPopUpButtonCell.m
index 54899b1a3..e7db43a3b 100644
--- a/macosx/ActionPopUpButtonCell.m
+++ b/macosx/ActionPopUpButtonCell.m
@@ -4,7 +4,7 @@
 
 - (id) initTextCell: (NSString *) string pullsDown: (BOOL) pullDown
 {
-	if (self = [super initTextCell: string pullsDown: YES])
+	if ((self = [super initTextCell: string pullsDown: YES]))
     {
         fImage = [NSImage imageNamed: @"ActionButton.png"];
         [fImage setFlipped: YES];
diff --git a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib
index 953609b35..5978d3733 100644
Binary files a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib and b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib differ