diff --git a/src/fe-gtk/menu.c b/src/fe-gtk/menu.c
index 9819d7be..02bd3f1e 100644
--- a/src/fe-gtk/menu.c
+++ b/src/fe-gtk/menu.c
@@ -1049,11 +1049,11 @@ menu_addfavoritemenu (server *serv, GtkWidget *menu, char *channel)
 
 	if (joinlist_is_in_list (serv, channel))
 	{
-		mg_create_icon_item (_("_Remove from Autojoin"), GTK_STOCK_REMOVE, menu, menu_delfav_cb, serv);
+		menu_toggle_item (_("_Autojoin"), menu, menu_delfav_cb, serv, TRUE);
 	}
 	else
 	{
-		mg_create_icon_item (_("_Add to Autojoin"), GTK_STOCK_ADD, menu, menu_addfav_cb, serv);
+		menu_toggle_item (_("_Autojoin"), menu, menu_addfav_cb, serv, FALSE);
 	}
 }
 
diff --git a/src/fe-gtk/servlistgui.c b/src/fe-gtk/servlistgui.c
index 566f4163..94cb209f 100644
--- a/src/fe-gtk/servlistgui.c
+++ b/src/fe-gtk/servlistgui.c
@@ -1061,24 +1061,18 @@ void
 servlist_autojoinedit (ircnet *net, char *channel, gboolean add)
 {
 	favchannel *fav;
-	char *buf;
 
 	if (add)
 	{
 		servlist_favchan_add (net, channel);
 		servlist_save ();
-		buf = g_strdup_printf (_("Channel %s added to autojoin."), channel);
 	}
 	else
 	{
 		fav = servlist_favchan_find (net, channel, NULL);
 		servlist_favchan_remove (net, fav);
 		servlist_save ();
-		buf = g_strdup_printf (_("Channel %s removed from autojoin."), channel);
 	}
-
-	fe_message (buf, FE_MSG_INFO);
-	g_free (buf);
 }
 
 static void