diff --git a/SparkleShare/Linux/SparkleStatusIcon.cs b/SparkleShare/Linux/SparkleStatusIcon.cs
index f93723f2..c52e5e9a 100644
--- a/SparkleShare/Linux/SparkleStatusIcon.cs
+++ b/SparkleShare/Linux/SparkleStatusIcon.cs
@@ -177,12 +177,12 @@ namespace SparkleShare {
 
                         } else {
                             folder_icon = IconTheme.Default.LoadIcon ("folder", 16, IconLookupFlags.GenericFallback);
+                            item.Activated += Controller.OpenFolderDelegate (folder_name);
                         }
 
                         item.Image = new Image (folder_icon);
                         (item.Child as Label).UseUnderline = false;
 
-                        item.Activated += Controller.OpenFolderDelegate (folder_name);
                         this.menu.Add (item);
 
                         i++;
diff --git a/SparkleShare/Mac/SparkleStatusIcon.cs b/SparkleShare/Mac/SparkleStatusIcon.cs
index 0f7aa8ca..96924fe3 100755
--- a/SparkleShare/Mac/SparkleStatusIcon.cs
+++ b/SparkleShare/Mac/SparkleStatusIcon.cs
@@ -222,6 +222,7 @@ namespace SparkleShare {
                     foreach (string folder_name in Controller.Folders) {
                         NSMenuItem item = new NSMenuItem ();
                         item.Title      = folder_name;
+                        this.folder_menu_items [i] = item;
 
                         if (!string.IsNullOrEmpty (Controller.FolderErrors [i])) {
                             item.Image   = this.caution_image;
@@ -242,13 +243,11 @@ namespace SparkleShare {
 
                         } else {
                             item.Image = this.folder_image;
+                            this.folder_menu_items [i].Activated += Controller.OpenFolderDelegate (folder_name);
                         }
 
                         item.Image.Size = new SizeF (16, 16);
 
-                        this.folder_menu_items [i] = item;
-                        this.folder_menu_items [i].Activated += Controller.OpenFolderDelegate (folder_name);
-
                         i++;
                     };
                 }
diff --git a/SparkleShare/Windows/SparkleStatusIcon.cs b/SparkleShare/Windows/SparkleStatusIcon.cs
index eecd783d..14648090 100644
--- a/SparkleShare/Windows/SparkleStatusIcon.cs
+++ b/SparkleShare/Windows/SparkleStatusIcon.cs
@@ -195,8 +195,6 @@ namespace SparkleShare {
                         Header = folder_name.Replace ("_", "__")
                     };
                     
-                    subfolder_item.Click += Controller.OpenFolderDelegate (folder_name);
-                    
                     Image subfolder_image = new Image () {
                         Source = SparkleUIHelpers.GetImageSource ("folder"),
                         Width  = 16,
@@ -227,6 +225,7 @@ namespace SparkleShare {
                         
                     } else {
                         subfolder_item.Icon = subfolder_image;
+                        subfolder_item.Click += Controller.OpenFolderDelegate (folder_name);
                     }
                     
                     this.context_menu.Items.Add (subfolder_item);