diff --git a/wicd/netentry.py b/wicd/netentry.py
index 903c3cd..c441f7e 100644
--- a/wicd/netentry.py
+++ b/wicd/netentry.py
@@ -507,6 +507,9 @@ class NetworkEntry(gtk.HBox):
         # Set up the Disconnect button
         self.disconnect_button = gtk.Button(stock=gtk.STOCK_DISCONNECT)
         self.connect_hbox.pack_start(self.disconnect_button, False, False)
+
+        # Create a label to hold the name of the entry
+        self.name_label = gtk.Label()
         
         # Set up the VBox that goes in the gtk.Expander
         self.expander_vbox = gtk.VBox(False, 1)
@@ -542,6 +545,7 @@ class NetworkEntry(gtk.HBox):
         aligner = gtk.Alignment(xscale=1.0)
         aligner.add(self.vbox_top)
         aligner.set_padding(0, 0, 15, 0)
+        self.expander_vbox.pack_start(self.name_label)
         self.expander_vbox.pack_start(aligner)
         self.expander_vbox.pack_start(self.connect_hbox, False, False)
     
@@ -563,6 +567,8 @@ class WiredNetworkEntry(NetworkEntry):
         self.image.set_from_file(wpath.images + "wired.png")
         self.image.show()
         self.connect_button.show()
+
+        self.name_label.set_label(language['wired_network'])
         
         #self.reset_static_checkboxes()
         self.is_full_gui = True
@@ -786,10 +792,10 @@ class WirelessNetworkEntry(NetworkEntry):
                             wireless.GetWirelessProperty(networkID, 
                                                         'encryption_method'))
 
-        # self.expander.set_label(self._escape(self.essid) + "   " + 
-        #                        self.lbl_strength.get_label() + "   " +
-        #                        self.lbl_encryption.get_label() + "   " +
-        #                        self.lbl_mac.get_label())
+        self.name_label.set_markup(self._escape(self.essid) + "   " + 
+                                self.lbl_strength.get_label() + "   " +
+                                self.lbl_encryption.get_label() + "   " +
+                                self.lbl_mac.get_label())
 
         # Pack the network status HBox.
         self.hbox_status.pack_start(self.lbl_strength, True, True)