diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c
index 9e28ee2c541..e55c9416343 100644
--- a/dlls/comctl32/treeview.c
+++ b/dlls/comctl32/treeview.c
@@ -4257,9 +4257,11 @@ TREEVIEW_RButtonDown(TREEVIEW_INFO *infoPtr, LPARAM lParam)
     }
     else
     {
-	TREEVIEW_RButtonUp(infoPtr, &ht.pt);
 	SetFocus(infoPtr->hwnd);
-	TREEVIEW_SendSimpleNotify(infoPtr, NM_RCLICK);
+	if(!TREEVIEW_SendSimpleNotify(infoPtr, NM_RCLICK))
+	{
+	    TREEVIEW_RButtonUp(infoPtr, &ht.pt);
+	}
     }
 
     return 0;