diff --git a/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/DocumentPropertiesDialog.cs b/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/DocumentPropertiesDialog.cs
index 87121963..d97d3c32 100644
--- a/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/DocumentPropertiesDialog.cs
+++ b/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/DocumentPropertiesDialog.cs
@@ -225,7 +225,7 @@ namespace UniversalEditor.UserInterface.Dialogs
 				txtObjectModel.Text = String.Empty;
 			}
 
-			Buttons[0].Enabled = (ObjectModel != null && DataFormat != null && Accessor != null);
+			Buttons[0].Enabled = (Accessor != null && (Mode == DocumentPropertiesDialogMode.Open || (Mode == DocumentPropertiesDialogMode.Save && ObjectModel != null && DataFormat != null)));
 		}
 
 		private string DataFormatReferenceToString(DataFormatReference dfr)