diff --git a/PROMS/Volian.Controls.Library/DisplayLibDocs.cs b/PROMS/Volian.Controls.Library/DisplayLibDocs.cs
index 462c4cb6..7e439c60 100644
--- a/PROMS/Volian.Controls.Library/DisplayLibDocs.cs
+++ b/PROMS/Volian.Controls.Library/DisplayLibDocs.cs
@@ -48,6 +48,8 @@ namespace Volian.Controls.Library
 		{
             _InitializingLibDocList = true;
             listBoxLibDocs.Items.Clear();
+			tbComment.Clear();
+			tbName.Clear();
 			groupPanelLibDocs.Style.BackColor = Color.Yellow;
             btnSave.Enabled = false;
             btnCancel.Enabled = false;
@@ -62,7 +64,6 @@ namespace Volian.Controls.Library
 		#region Events
 		private void listBoxLibDocs_Click(object sender, EventArgs e)
 		{
-            if (listBoxLibDocs.SelectedIndex == _SelectedLibDoc) return;
 			UpdateUsageList();
 		}
 		public void RefreshLibDocPanel(DisplayTabControl tc)
@@ -70,10 +71,11 @@ namespace Volian.Controls.Library
 			int cursel = listBoxLibDocs.SelectedIndex;
 			LibDocListFillIn(tc);
 			listBoxLibDocs.SelectedIndex = cursel;
-			UpdateUsageList();  // do I need this or does it happen on the above.
+			UpdateUsageList();
 		}
 		private void UpdateUsageList()
 		{
+			if (listBoxLibDocs.SelectedIndex == -1) return;
 			groupPanelLibDocs.Style.BackColor = Color.Orange;
 			_SelectedLibDoc = listBoxLibDocs.SelectedIndex;
 			listBoxUsages.Items.Clear();