diff --git a/modules/juce_gui_basics/widgets/juce_TreeView.cpp b/modules/juce_gui_basics/widgets/juce_TreeView.cpp
index 1aaedce921..305d602385 100644
--- a/modules/juce_gui_basics/widgets/juce_TreeView.cpp
+++ b/modules/juce_gui_basics/widgets/juce_TreeView.cpp
@@ -313,6 +313,9 @@ public:
 
         if (iter != itemComponents.end())
         {
+            if (itemUnderMouse == iter->get())
+                itemUnderMouse = nullptr;
+
             if (isMouseDraggingInChildComp (*(iter->get())))
                 owner.hideDragHighlight();