diff --git a/c_gui/MiCasa.cs b/c_gui/MiCasa.cs
index d187b20c..ff5a4acd 100644
--- a/c_gui/MiCasa.cs
+++ b/c_gui/MiCasa.cs
@@ -898,6 +898,9 @@ public class MiCasa : Store
 				{
 					Glade.XML gxmlTemp = new Glade.XML (Common.GladeFile, "dialogLinkKeyValue", null);
 					gxmlTemp.Autoconnect (this);
+					dialogLinkKeyValue.TransientFor = (Gtk.Window)CasaMain.gxml.GetWidget("dialogNewSecret");
+					dialogLinkKeyValue.Modal = true;
+					
 					
 					// show MICASA tab only
 					(notebook2.GetNthPage(Common.STORE_MICASA)).Visible = true;
@@ -943,7 +946,9 @@ public class MiCasa : Store
 					// display info on this secret
 					labelLinkSecretID.Text = entrySecretID.Text;
 					labelLinkKeyID.Text = selected;
-					entryLinkValue.Text = secret.getKeyValue(selected);
+					//entryLinkValue.Text = secret.getKeyValue(selected);
+					entryLinkValue.Sensitive = false;
+					entryLinkValue.Text = "********";
 					entryLinkValue.Changed +=new EventHandler(entryLinkValue_Changed);
 					entryLinkValue.LeaveNotifyEvent +=new LeaveNotifyEventHandler(entryLinkValue_LeaveNotifyEvent);