diff --git a/lcl/grids.pas b/lcl/grids.pas
index ce13db224a..0e7960149b 100644
--- a/lcl/grids.pas
+++ b/lcl/grids.pas
@@ -7967,6 +7967,8 @@ begin
   end;
   if aEditor<>Editor then
     Editor := aEditor;
+  if Assigned(Editor) and not Assigned(Editor.Popupmenu) then
+    Editor.PopupMenu := PopupMenu;
   {$ifdef DbgGrid}
   DebugLnExit('TCustomGrid.SelectEditor END');
   {$endif}