diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/FolderExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/FolderExt.cs
index b8adb06a..3e2fd1e8 100644
--- a/PROMS/VEPROMS.CSLA.Library/Extension/FolderExt.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Extension/FolderExt.cs
@@ -266,6 +266,19 @@ namespace VEPROMS.CSLA.Library
 		#endregion
 		public Color BackColor
 		{ get { return FolderConfig.Default_BkColor; } }
+		public bool HasWorkingDraft
+		{
+			get
+			{
+				if (FolderDocVersionCount > 0)
+				{
+					foreach (DocVersionInfo dvi in FolderDocVersions)
+						if (dvi.VersionType == 0)
+							return true;
+				}
+				return false;
+			}
+		}
 		#region Extension
 		partial class FolderInfoExtension : extensionBase
 		{
diff --git a/PROMS/Volian.Controls.Library/vlnTreeView.cs b/PROMS/Volian.Controls.Library/vlnTreeView.cs
index 11709497..a2467ec6 100644
--- a/PROMS/Volian.Controls.Library/vlnTreeView.cs
+++ b/PROMS/Volian.Controls.Library/vlnTreeView.cs
@@ -401,7 +401,7 @@ namespace Volian.Controls.Library
 							cm.MenuItems.Add("Insert Folder After", new EventHandler(mi_Click));
 						}
 						if (fi.FolderDocVersionCount == 0) cm.MenuItems.Add("New Folder", new EventHandler(mi_Click));
-						if (fi.ChildFolderCount == 0) cm.MenuItems.Add("Create Working Draft", new EventHandler(mi_Click));
+						if (fi.ChildFolderCount == 0 && !fi.HasWorkingDraft) cm.MenuItems.Add("Create Working Draft", new EventHandler(mi_Click));
 					}
 					else if (tn.VEObject as DocVersionInfo != null)		// DocVersions can only contain procs
 						cm.MenuItems.Add("New Procedure", new EventHandler(mi_Click));