diff --git a/CASA.changes b/CASA.changes
index 139117d6..3dc342f5 100644
--- a/CASA.changes
+++ b/CASA.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jan 19 10:57:34 MST 2006 - jnorman@novell.com
+
+- Bug 142939.  Keep 'New Key' menu item active.
+
 -------------------------------------------------------------------
 Wed Jan 18 16:12:34 MST 2006 - jnorman@novell.com
 
diff --git a/c_gui/CasaMain.cs b/c_gui/CasaMain.cs
index 0be7d3e7..c2c2174e 100644
--- a/c_gui/CasaMain.cs
+++ b/c_gui/CasaMain.cs
@@ -120,6 +120,8 @@ namespace Novell.CASA.GUI
 		public static CasaTray mCasaTray = null;
 		public static bool m_bShowDebug = false;
 		public static bool m_bNotifyUser = true;
+		public static bool m_bGuiLocked = false;
+
 
 
 		///#######################################################################
@@ -568,7 +570,8 @@ namespace Novell.CASA.GUI
 			}
 			else
 			{
-				UnlockGUI();
+				if (m_bGuiLocked)
+					UnlockGUI();
 			}
 
 
@@ -842,6 +845,7 @@ namespace Novell.CASA.GUI
 			mmiDebug.Sensitive = false;
 			mmiOptions.Sensitive = false;
 			mmiEdit.Sensitive = false;
+			m_bGuiLocked = true;
 		}
 
 		internal void UnlockGUI()
@@ -857,6 +861,8 @@ namespace Novell.CASA.GUI
 			mmiOptions.Sensitive = true;
 			mmiEdit.Sensitive = true;
 
+			m_bGuiLocked = false;
+
 			//refresh secrets
 			RefreshStores();