diff --git a/lcl/include/control.inc b/lcl/include/control.inc
index 3f3f855306..3961c98b49 100644
--- a/lcl/include/control.inc
+++ b/lcl/include/control.inc
@@ -1922,10 +1922,10 @@ begin
     MouseCapture := False;
   end;
   
+  if CheckMenuPopup(Message.pos) then
+    Message.Result := 1;
+
   DoMouseUp(Message, mbRight);
-  if Message.Result = 0 then 
-    if CheckMenuPopup(Message.pos) then
-      Message.Result := 1;
 end;
 
 {------------------------------------------------------------------------------