diff --git a/CASA.changes b/CASA.changes
index 3dc342f5..5607ec71 100644
--- a/CASA.changes
+++ b/CASA.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jan 19 11:17:34 MST 2006 - jnorman@novell.com
+
+- Bug 143846. Suppress current key from being linked to itself.
+
 -------------------------------------------------------------------
 Thu Jan 19 10:57:34 MST 2006 - jnorman@novell.com
 
diff --git a/c_gui/MiCasa.cs b/c_gui/MiCasa.cs
index c33aad05..36d459b3 100644
--- a/c_gui/MiCasa.cs
+++ b/c_gui/MiCasa.cs
@@ -1043,6 +1043,11 @@ public class MiCasa : Store
 				NameValueCollection nvc = secret.getKeyValueCollection();
 				for (int i=0; i<nvc.Count; i++)
 				{
+					// don't allow linking this key to ourself.
+					if (labelLinkSecretID.Text.Equals(selected) 
+						&& labelLinkKeyID.Text.Equals(nvc.GetKey(i)))
+						continue;
+
 					tsAvailableKeys.AppendValues(nvc.GetKey(i), nvc.GetValues(i)[0]);
 				}
 			}