diff --git a/lcl/grids.pas b/lcl/grids.pas
index b8b25fa2f5..0cabf980ed 100644
--- a/lcl/grids.pas
+++ b/lcl/grids.pas
@@ -7093,7 +7093,10 @@ end;
 
 procedure TCustomGrid.UnLockEditor;
 begin
-  Dec(FEditorHidingCount);
+  if FEDitorHidingCount>0 then
+    Dec(FEditorHidingCount)
+  else
+    DebugLn('WARNING: unpaired Unlock Editor');
   {$ifdef dbgGrid}DebugLn('==< LockEditor: ', dbgs(FEditorHidingCount)); {$endif}
 end;