diff --git a/src/generic/treectrl.cpp b/src/generic/treectrl.cpp
index 992939ca8a..02d693c324 100644
--- a/src/generic/treectrl.cpp
+++ b/src/generic/treectrl.cpp
@@ -246,7 +246,7 @@ wxGenericTreeItem *wxGenericTreeItem::HitTest( const wxPoint& point,
     // FIXME why +5?
     if ((point.x > m_xCross-5) && (point.x < m_xCross+5) &&
         (point.y > m_yCross-5) && (point.y < m_yCross+5) &&
-        HasChildren())
+        (IsExpanded() || HasPlus()))
     {
       onButton = TRUE;
       return this;