Made sure the OK and Cancel buttons set the DialogResult just before closing the form

PROMS/VEPROMS User Interface/frmFolderProperties.cs

@@ -283,7 +283,6 @@ namespace VEPROMS
 		{
 
 			folderConfigBindingSource.EndEdit();
-			DialogResult = DialogResult.OK;
 			// Save Default settings for User
 			//
 			// Save whether we should display the default values on this property page
@@ -291,12 +290,14 @@ namespace VEPROMS
 			Settings.Default.Save();
 			_FolderConfig.MyFolder.Config = _FolderConfig.ToString();
             _FolderConfig.MyFolder.Save().Dispose();
+			DialogResult = DialogResult.OK;
 			this.Close();
 		}
 
 		private void ppBtnCancel_Click(object sender, EventArgs e)
 		{
 			folderConfigBindingSource.CancelEdit();
+			DialogResult = DialogResult.Cancel;
 			this.Close();
 		}