diff --git a/SparkleShare/SparkleControllerBase.cs b/SparkleShare/SparkleControllerBase.cs
index 1625ac34..f6d881d5 100644
--- a/SparkleShare/SparkleControllerBase.cs
+++ b/SparkleShare/SparkleControllerBase.cs
@@ -245,7 +245,8 @@ namespace SparkleShare {
                     SparkleKeys.ImportPrivateKey (key_pair [0]);
 
                     CurrentUser.PublicKey = File.ReadAllText (key_pair [1]);
-                    
+                    FolderListChanged (); // FIXME: Hacky way to update status icon menu to show the key
+
                 }).Start ();
 
             } else {
diff --git a/SparkleShare/SparkleStatusIconController.cs b/SparkleShare/SparkleStatusIconController.cs
index 94084f2f..c03b8b94 100755
--- a/SparkleShare/SparkleStatusIconController.cs
+++ b/SparkleShare/SparkleStatusIconController.cs
@@ -102,7 +102,7 @@ namespace SparkleShare {
 
         public bool LinkCodeItemEnabled {
             get {
-                return !Program.Controller.FirstRun;
+                return !string.IsNullOrEmpty (Program.Controller.CurrentUser.PublicKey);
             }
         }