diff --git a/wxPython/demo/wxListCtrl.py b/wxPython/demo/wxListCtrl.py
index d640ecddb6..a7cfe45d88 100644
--- a/wxPython/demo/wxListCtrl.py
+++ b/wxPython/demo/wxListCtrl.py
@@ -98,6 +98,7 @@ class TestListCtrlPanel(wxPanel, wxColumnSorterMixin):
 
         self.list = TestListCtrl(self, tID,
                                  style=wxLC_REPORT | wxSUNKEN_BORDER
+                                 | wxLC_EDIT_LABELS
                                  #| wxLC_NO_HEADER
                                  #| wxLC_VRULES | wxLC_HRULES
                                  )
@@ -121,6 +122,7 @@ class TestListCtrlPanel(wxPanel, wxColumnSorterMixin):
         EVT_LIST_COL_BEGIN_DRAG(self, tID, self.OnColBeginDrag)
         EVT_LIST_COL_DRAGGING(self, tID, self.OnColDragging)
         EVT_LIST_COL_END_DRAG(self, tID, self.OnColEndDrag)
+        EVT_LIST_BEGIN_LABEL_EDIT(self, tID, self.OnBeginEdit)
 
         EVT_LEFT_DCLICK(self.list, self.OnDoubleClick)
         EVT_RIGHT_DOWN(self.list, self.OnRightDown)
@@ -218,6 +220,8 @@ class TestListCtrlPanel(wxPanel, wxColumnSorterMixin):
             #event.Veto()  # doesn't work
             # this does
             self.list.SetItemState(10, 0, wxLIST_STATE_SELECTED)
+        event.Skip()
+
 
     def OnItemDeselected(self, evt):
         item = evt.GetItem()
@@ -233,6 +237,10 @@ class TestListCtrlPanel(wxPanel, wxColumnSorterMixin):
         self.log.WriteText("OnItemActivated: %s\nTopItem: %s" %
                            (self.list.GetItemText(self.currentItem), self.list.GetTopItem()))
 
+    def OnBeginEdit(self, event):
+        self.log.WriteText("OnBeginEdit")
+        event.Allow()
+
     def OnItemDelete(self, event):
         self.log.WriteText("OnItemDelete\n")
 
@@ -272,11 +280,13 @@ class TestListCtrlPanel(wxPanel, wxColumnSorterMixin):
             self.popupID3 = wxNewId()
             self.popupID4 = wxNewId()
             self.popupID5 = wxNewId()
+            self.popupID6 = wxNewId()
             EVT_MENU(self, self.popupID1, self.OnPopupOne)
             EVT_MENU(self, self.popupID2, self.OnPopupTwo)
             EVT_MENU(self, self.popupID3, self.OnPopupThree)
             EVT_MENU(self, self.popupID4, self.OnPopupFour)
             EVT_MENU(self, self.popupID5, self.OnPopupFive)
+            EVT_MENU(self, self.popupID6, self.OnPopupSix)
 
         # make a menu
         menu = wxMenu()
@@ -289,6 +299,7 @@ class TestListCtrlPanel(wxPanel, wxColumnSorterMixin):
         menu.Append(self.popupID3, "ClearAll and repopulate")
         menu.Append(self.popupID4, "DeleteAllItems")
         menu.Append(self.popupID5, "GetItem")
+        menu.Append(self.popupID6, "Edit")
 
         # Popup the menu.  If an item is selected then its handler
         # will be called before PopupMenu returns.
@@ -318,6 +329,10 @@ class TestListCtrlPanel(wxPanel, wxColumnSorterMixin):
         item = self.list.GetItem(self.currentItem)
         print item.m_text, item.m_itemId, self.list.GetItemData(self.currentItem)
 
+    def OnPopupSix(self, event):
+        self.list.EditLabel(self.currentItem)
+
+
     def OnSize(self, event):
         w,h = self.GetClientSizeTuple()
         self.list.SetDimensions(0, 0, w, h)