diff --git a/lcl/interfaces/gtk2/gtk2callback.inc b/lcl/interfaces/gtk2/gtk2callback.inc
index 4dd90e65e1..09b1f6822a 100644
--- a/lcl/interfaces/gtk2/gtk2callback.inc
+++ b/lcl/interfaces/gtk2/gtk2callback.inc
@@ -2039,6 +2039,11 @@ var
       Result:=(LastMouse.Window<>nil) and (LastMouse.Window=Event^.Window);
     end;
 
+    function LastClickInSameComponent: boolean;
+    begin
+      Result:=(LastMouse.Component<>nil) and (LastMouse.Component=AWinControl);
+    end;
+
     function LastClickAtSamePosition: boolean;
     begin
       Result:= (Abs(EventXY.X-LastMouse.WindowPoint.X)<=DblClickThreshold)
@@ -2053,6 +2058,7 @@ var
     function TestIfMultiClick: boolean;
     begin
       Result:=LastClickInSameGdkWindow
+          and LastClickInSameComponent
           and LastClickAtSamePosition
           and LastClickInTime;
     end;