diff --git a/PROMS/VEPROMS User Interface/frmFolderProperties.cs b/PROMS/VEPROMS User Interface/frmFolderProperties.cs
index 3bda8c21..f606f603 100644
--- a/PROMS/VEPROMS User Interface/frmFolderProperties.cs	
+++ b/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();
 		}
 
diff --git a/PROMS/VEPROMS User Interface/frmProcedureProperties.cs b/PROMS/VEPROMS User Interface/frmProcedureProperties.cs
index 6fce98c6..02d62c9e 100644
--- a/PROMS/VEPROMS User Interface/frmProcedureProperties.cs	
+++ b/PROMS/VEPROMS User Interface/frmProcedureProperties.cs	
@@ -60,7 +60,6 @@ namespace VEPROMS
 
 		private void ppBtnOK_Click(object sender, EventArgs e)
 		{
-			DialogResult = DialogResult.OK;
 			procedureConfigBindingSource.EndEdit();
 			// Save Default settings for User
 			//
@@ -70,6 +69,7 @@ namespace VEPROMS
 			_ProcedureConfig.MyProcedure.Save().Dispose();
 			SaveText(ppProcTitleStpRTB);
 			SaveText(ppProcNumStpRTB);
+			DialogResult = DialogResult.OK;
 			this.Close();
 		}
 		public void SaveText(StepRTB myStepRTB)
@@ -88,6 +88,7 @@ namespace VEPROMS
 		private void ppBtnCancel_Click(object sender, EventArgs e)
 		{
 			procedureConfigBindingSource.CancelEdit();
+			this.DialogResult = DialogResult.Cancel;
 			this.Close();
 		}
 
diff --git a/PROMS/VEPROMS User Interface/frmSysOptions.cs b/PROMS/VEPROMS User Interface/frmSysOptions.cs
index 125785ee..0d4ccbfc 100644
--- a/PROMS/VEPROMS User Interface/frmSysOptions.cs	
+++ b/PROMS/VEPROMS User Interface/frmSysOptions.cs	
@@ -100,6 +100,7 @@ namespace VEPROMS
 				Settings.Default.PropPageStyle = 3;
 
 			Settings.Default.Save();
+			this.DialogResult = DialogResult.OK;
 			this.Close();
 		}