diff --git a/components/lazreport/doc/contributors.txt b/components/lazreport/doc/contributors.txt
index a1f9ecf55c..899642edfc 100644
--- a/components/lazreport/doc/contributors.txt
+++ b/components/lazreport/doc/contributors.txt
@@ -7,6 +7,7 @@ German Basisty	      (ar)
 Javier Villarroya     (es)
 Jesus Reyes A.        (mx)
 Joerg Braun           (de)
+Junior Goncalves      (br)
 Mattias Gaertner      (de)
 Olivier Guilbaud      (fr)
 Petr Smolik           (cz)
diff --git a/components/lazreport/source/lr_desgn.pas b/components/lazreport/source/lr_desgn.pas
index 01a86771d2..cd0d28ad24 100644
--- a/components/lazreport/source/lr_desgn.pas
+++ b/components/lazreport/source/lr_desgn.pas
@@ -2885,6 +2885,10 @@ var
   i, tx, ty, tx1, ty1, d, d1: Integer;
   t, t1: TfrView;
 begin
+  {$IFNDEF EXTOI}
+  if ActiveControl.Parent = ObjInsp.fPropertyGrid then
+    exit;
+  {$ENDIF}
   StepX := 0; StepY := 0;
   if (Key=VK_F11) then
     ObjInsp.Visible:=not ObjInsp.Visible;