diff --git a/ChangeLog b/ChangeLog
index 1bddb604a2..66735ee810 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-07  Robert Love  <rml@novell.com>
+
+	* gnome/applet/applet.c: do not draw the VPN menu's seperator if there
+	  are not any VPN connections above it.
+
 2005-07-07  Robert Love  <rml@novell.com>
 
 	* gnome/applet/applet.c: whoops, left some "dog" debugging code in.
diff --git a/gnome/applet/applet.c b/gnome/applet/applet.c
index bbbdad9b93..2794144d8c 100644
--- a/gnome/applet/applet.c
+++ b/gnome/applet/applet.c
@@ -1664,8 +1664,13 @@ static void nmwa_menu_add_vpn_menu (GtkWidget *menu, NMWirelessApplet *applet)
 		g_signal_connect (G_OBJECT (vpn_item), "activate", G_CALLBACK (nmwa_menu_vpn_item_activate), applet);
 		gtk_menu_shell_append (GTK_MENU_SHELL (vpn_menu), GTK_WIDGET (vpn_item));
 	}
-	other_item = GTK_MENU_ITEM (gtk_separator_menu_item_new ());
-	gtk_menu_shell_append (GTK_MENU_SHELL (vpn_menu), GTK_WIDGET (other_item));
+
+	/* Draw a seperator, but only if we have VPN connections above it */
+	if (applet->gui_vpn_connections)
+	{
+		other_item = GTK_MENU_ITEM (gtk_separator_menu_item_new ());
+		gtk_menu_shell_append (GTK_MENU_SHELL (vpn_menu), GTK_WIDGET (other_item));
+	}
 
 	other_item = GTK_MENU_ITEM (gtk_menu_item_new_with_label (_("Configure VPN...")));
 	g_signal_connect (G_OBJECT (other_item), "activate", G_CALLBACK (nmwa_menu_configure_vpn_item_activate), applet);