diff --git a/Src/XCore/xWindow.cs b/Src/XCore/xWindow.cs
index 199f86d168..5a440c2b06 100644
--- a/Src/XCore/xWindow.cs
+++ b/Src/XCore/xWindow.cs
@@ -1890,10 +1890,6 @@ public virtual void OnPropertyChanged(string name)
 						}
 					}
 					break;
-
-				case "DocumentName":
-					UpdateCaptionBar();
-					break;
 				case "ShowRecordList": // Replaces obsolete "ShowTreeBar".
 					UpdateSidebarAndRecordBarDisplay(true);
 					break;
@@ -2152,7 +2148,7 @@ protected void UpdateCaptionBar()
 		{
 			Text = String.Format("{0} - {1}",
 				m_propertyTable.GetStringProperty("DocumentName", ""),
-				m_propertyTable.GetStringProperty("applicationName", "application name???")); ;
+				m_propertyTable.GetStringProperty("applicationName", "application name???"));
 		}
 
 		#region Helper methods
diff --git a/Src/xWorks/FwXWindow.cs b/Src/xWorks/FwXWindow.cs
index 3de0d5435a..5b6d166290 100644
--- a/Src/xWorks/FwXWindow.cs
+++ b/Src/xWorks/FwXWindow.cs
@@ -534,7 +534,7 @@ protected void InitMediatorValues(LcmCache cache)
 			m_propertyTable.LocalSettingsId = "local";
 			m_propertyTable.SetProperty("cache", cache, true);
 			m_propertyTable.SetPropertyPersistence("cache", false);
-			m_propertyTable.SetProperty("DocumentName", GetProjectName(cache), true);
+			m_propertyTable.SetProperty("DocumentName", GetProjectName(cache), false);
 			m_propertyTable.SetPropertyPersistence("DocumentName", false);
 			var path = LcmFileHelper.GetConfigSettingsDir(cache.ProjectId.ProjectFolder);
 			Directory.CreateDirectory(path);
@@ -1289,13 +1289,6 @@ private void LaunchProjPropertiesDlg()
 					{
 						fFilesMoved = m_app.UpdateExternalLinks(sLinkedFilesRootDir);
 					}
-					// no need for any of these refreshes if entire window has been/will be
-					// destroyed and recreated.
-					if (!fDbRenamed && !fFilesMoved)
-					{
-						m_propertyTable.SetProperty("DocumentName", cache.ProjectId.UiName, true);
-						m_propertyTable.SetPropertyPersistence("DocumentName", false);
-					}
 				}
 			}
 			if (fDbRenamed)