diff --git a/SheepShaver/src/MacOSX/PrefsEditor/English.lproj/MainMenu.nib/info.nib b/SheepShaver/src/MacOSX/PrefsEditor/English.lproj/MainMenu.nib/info.nib
index 5f738e61..b92e8621 100644
--- a/SheepShaver/src/MacOSX/PrefsEditor/English.lproj/MainMenu.nib/info.nib
+++ b/SheepShaver/src/MacOSX/PrefsEditor/English.lproj/MainMenu.nib/info.nib
@@ -18,6 +18,6 @@
 		<integer>29</integer>
 	</array>
 	<key>IBSystem Version</key>
-	<string>8L2127</string>
+	<string>8R2218</string>
 </dict>
 </plist>
diff --git a/SheepShaver/src/MacOSX/PrefsEditor/English.lproj/MainMenu.nib/keyedobjects.nib b/SheepShaver/src/MacOSX/PrefsEditor/English.lproj/MainMenu.nib/keyedobjects.nib
index 1c5d63e2..20efaaf1 100644
Binary files a/SheepShaver/src/MacOSX/PrefsEditor/English.lproj/MainMenu.nib/keyedobjects.nib and b/SheepShaver/src/MacOSX/PrefsEditor/English.lproj/MainMenu.nib/keyedobjects.nib differ
diff --git a/SheepShaver/src/MacOSX/PrefsEditor/PrefsEditor.m b/SheepShaver/src/MacOSX/PrefsEditor/PrefsEditor.mm
similarity index 99%
rename from SheepShaver/src/MacOSX/PrefsEditor/PrefsEditor.m
rename to SheepShaver/src/MacOSX/PrefsEditor/PrefsEditor.mm
index 8359b622..6afad296 100644
--- a/SheepShaver/src/MacOSX/PrefsEditor/PrefsEditor.m
+++ b/SheepShaver/src/MacOSX/PrefsEditor/PrefsEditor.mm
@@ -31,6 +31,7 @@ const int CDROMRefNum = -62;			// RefNum of driver
 {
   self = [super init];
 
+#ifdef STANDALONE_PREFS
 	AddPrefsDefaults();
 	AddPlatformPrefsDefaults();
 
@@ -38,6 +39,7 @@ const int CDROMRefNum = -62;			// RefNum of driver
 	LoadPrefs();
   chdir([[[NSBundle mainBundle] bundlePath] cString]);
   chdir("..");
+#endif
 
   return self;
 }
@@ -316,8 +318,11 @@ NSString *getStringFromPrefs(const char *key)
   PrefsReplaceString("ether", [[ethernetInterface stringValue] cString]);
 
   SavePrefs();
+
+#ifdef STANDALONE_PREFS
   PrefsExit();
   exit(0);
+#endif
 }
 
 - (void) dealloc
diff --git a/SheepShaver/src/MacOSX/PrefsEditor/SheepShaverPrefs.xcodeproj/project.pbxproj b/SheepShaver/src/MacOSX/PrefsEditor/SheepShaverPrefs.xcodeproj/project.pbxproj
index 752fd414..92ed7a0e 100644
--- a/SheepShaver/src/MacOSX/PrefsEditor/SheepShaverPrefs.xcodeproj/project.pbxproj
+++ b/SheepShaver/src/MacOSX/PrefsEditor/SheepShaverPrefs.xcodeproj/project.pbxproj
@@ -7,7 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		084186B10B3A0515004B1F63 /* PrefsEditor.m in Sources */ = {isa = PBXBuildFile; fileRef = 084186B00B3A0515004B1F63 /* PrefsEditor.m */; };
+		084186B10B3A0515004B1F63 /* PrefsEditor.mm in Sources */ = {isa = PBXBuildFile; fileRef = 084186B00B3A0515004B1F63 /* PrefsEditor.mm */; };
 		08DC90BD0B67074C00799A45 /* prefs_items.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 08DC90BC0B67074C00799A45 /* prefs_items.cpp */; };
 		08DC90BF0B67075D00799A45 /* prefs_unix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 08DC90BE0B67075D00799A45 /* prefs_unix.cpp */; };
 		08DC90C10B67077300799A45 /* prefs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 08DC90C00B67077300799A45 /* prefs.cpp */; };
@@ -19,7 +19,7 @@
 
 /* Begin PBXFileReference section */
 		084186AF0B3A0515004B1F63 /* PrefsEditor.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PrefsEditor.h; sourceTree = "<group>"; };
-		084186B00B3A0515004B1F63 /* PrefsEditor.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = PrefsEditor.m; sourceTree = "<group>"; };
+		084186B00B3A0515004B1F63 /* PrefsEditor.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = PrefsEditor.mm; sourceTree = "<group>"; };
 		089C165DFE840E0CC02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		08DC90BC0B67074C00799A45 /* prefs_items.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = prefs_items.cpp; path = ../../prefs_items.cpp; sourceTree = SOURCE_ROOT; };
 		08DC90BE0B67075D00799A45 /* prefs_unix.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = prefs_unix.cpp; path = ../../Unix/prefs_unix.cpp; sourceTree = SOURCE_ROOT; };
@@ -102,7 +102,7 @@
 				29B97323FDCFA39411CA2CEA /* Frameworks */,
 				19C28FACFE9D520D11CA2CBB /* Products */,
 				084186AF0B3A0515004B1F63 /* PrefsEditor.h */,
-				084186B00B3A0515004B1F63 /* PrefsEditor.m */,
+				084186B00B3A0515004B1F63 /* PrefsEditor.mm */,
 			);
 			name = SheepShaverPrefs;
 			sourceTree = "<group>";
@@ -189,7 +189,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				8D11072D0486CEB800E47090 /* main.m in Sources */,
-				084186B10B3A0515004B1F63 /* PrefsEditor.m in Sources */,
+				084186B10B3A0515004B1F63 /* PrefsEditor.mm in Sources */,
 				08DC90BD0B67074C00799A45 /* prefs_items.cpp in Sources */,
 				08DC90BF0B67075D00799A45 /* prefs_unix.cpp in Sources */,
 				08DC90C10B67077300799A45 /* prefs.cpp in Sources */,
@@ -227,7 +227,10 @@
 				GCC_INPUT_FILETYPE = sourcecode.cpp.objcpp;
 				GCC_MODEL_TUNING = G5;
 				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = PREFS_EDITOR;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					PREFS_EDITOR,
+					STANDALONE_PREFS,
+				);
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(HOME)/Applications";
 				OTHER_CFLAGS = "$(inherited)";
@@ -247,7 +250,10 @@
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				GCC_INPUT_FILETYPE = sourcecode.cpp.objcpp;
 				GCC_MODEL_TUNING = G5;
-				GCC_PREPROCESSOR_DEFINITIONS = PREFS_EDITOR;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					PREFS_EDITOR,
+					STANDALONE_PREFS,
+				);
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(HOME)/Applications";
 				OTHER_CFLAGS = "$(inherited)";