diff --git a/PROMS/VEPROMS User Interface/frmVersionsProperties.cs b/PROMS/VEPROMS User Interface/frmVersionsProperties.cs
index 84f6da23..e8f48be6 100644
--- a/PROMS/VEPROMS User Interface/frmVersionsProperties.cs	
+++ b/PROMS/VEPROMS User Interface/frmVersionsProperties.cs	
@@ -103,6 +103,7 @@ namespace VEPROMS
 		}
 		private void btnVersionsPropOK_Click(object sender, EventArgs e)
 		{
+			docVersionConfigBindingSource.EndEdit(); // need to end the edit session first or any format selection chanage will not stick  B2015-157
 			if (_DocVersionConfig.Unit_Count > 0 || (_Apples != null && _Apples.Count > 0))
 			{
 				if (_DeletedApples != null && _DeletedApples.Count > 0)
@@ -162,7 +163,7 @@ namespace VEPROMS
 
 			_DocVersionConfig.Print_UnitNumberForPageList = ppTxbxUnitNum.Text;
 
-			docVersionConfigBindingSource.EndEdit();
+			//docVersionConfigBindingSource.EndEdit();
 			// Save Default settings for User
 			//
 			// Save whether we should display the default values on this property page
@@ -619,6 +620,7 @@ namespace VEPROMS
 		/// <param name="e">EventArgs</param>
 		private void ppCmbxFormat_SelectedValueChanged(object sender, EventArgs e)
 		{
+			if (!_Initializing)
 			ProcessCmbxSelectedValueChange(ppCmbxFormat, _DefaultFormatName, ppBtnDefaultFmt, ppLblFormatDefault);
 		}