diff --git a/Frameworks/BundleEditor/src/BundleEditor.mm b/Frameworks/BundleEditor/src/BundleEditor.mm
index a040d5b9..ab65db18 100644
--- a/Frameworks/BundleEditor/src/BundleEditor.mm
+++ b/Frameworks/BundleEditor/src/BundleEditor.mm
@@ -367,7 +367,7 @@ static be::entry_ptr parent_for_column (NSBrowser* aBrowser, NSInteger aColumn,
 
 - (BOOL)commitEditing
 {
-	if(!bundleItem)
+	if(!bundleItem || !bundleItemContent)
 		return YES;
 
 	[sharedPropertiesViewController commitEditing];