diff --git a/wxPython/demo/CustomTreeCtrl.py b/wxPython/demo/CustomTreeCtrl.py
index 9d816036da..25214d52fa 100644
--- a/wxPython/demo/CustomTreeCtrl.py
+++ b/wxPython/demo/CustomTreeCtrl.py
@@ -1816,7 +1816,6 @@ class CustomTreeCtrl(CT.CustomTreeCtrl):
             self.log.write("Beginning Drag..." + "\n")
 
             event.Allow()
-            event.Skip()
 
 
     def OnBeginRDrag(self, event):
@@ -1826,7 +1825,6 @@ class CustomTreeCtrl(CT.CustomTreeCtrl):
             self.log.write("Beginning Right Drag..." + "\n")
 
             event.Allow()
-            event.Skip()
         
 
     def OnEndDrag(self, event):
diff --git a/wxPython/docs/CHANGES.txt b/wxPython/docs/CHANGES.txt
index 150779f304..977754eed0 100644
--- a/wxPython/docs/CHANGES.txt
+++ b/wxPython/docs/CHANGES.txt
@@ -1,6 +1,18 @@
 Recent Changes for wxPython
 =====================================================================
 
+2.8.0.2
+-------
+* 
+
+wxGTK: Fix for controls on a toolbar being the full height of the
+toolbar instead of their natural height.
+
+wx.lib.customtreectrl patches from Andrea Gavana.
+
+
+
+
 
 2.8.0.1
 -------
diff --git a/wxPython/wx/lib/customtreectrl.py b/wxPython/wx/lib/customtreectrl.py
index d987320ca0..7bfed72f48 100644
--- a/wxPython/wx/lib/customtreectrl.py
+++ b/wxPython/wx/lib/customtreectrl.py
@@ -4855,7 +4855,7 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
                         current = self.GetItemParent(current)
                         if current:
                             next = self.GetNextSibling(current)
-                            if not self.IsEnabled(next):
+                            if not next or not self.IsEnabled(next):
                                 next = None
 
                 else:
@@ -5130,7 +5130,7 @@ class CustomTreeCtrl(wx.PyScrolledWindow):
         underMouse = thisItem
         underMouseChanged = underMouse != self._underMouse
 
-        if underMouse and (flags & TREE_HITTEST_ONITEMBUTTON) and not event.LeftIsDown() and \
+        if underMouse and (flags & TREE_HITTEST_ONITEM) and not event.LeftIsDown() and \
            not self._isDragging and (not self._renameTimer or not self._renameTimer.IsRunning()):
             underMouse = underMouse
         else: