diff --git a/components/tvplanit/source/vpdayview.pas b/components/tvplanit/source/vpdayview.pas
index 8430da033..a3850939d 100644
--- a/components/tvplanit/source/vpdayview.pas
+++ b/components/tvplanit/source/vpdayview.pas
@@ -109,7 +109,7 @@ type
   { Forward Declarations }
   TVpDayView = class;
 
-  TVpDvInPlaceEdit = class(TCustomEdit)
+  TVpDvInplaceEdit = class(TCustomEdit)
   protected{private}
     procedure CreateParams(var Params: TCreateParams); override;
     procedure KeyDown(var Key: Word; Shift: TShiftState); override;
@@ -583,6 +583,7 @@ begin
     VK_ESCAPE:
       begin
         Key := 0;
+        Hide;
         TVpDayView(Owner).SetFocus;
       end;
 
diff --git a/components/tvplanit/source/vptasklist.pas b/components/tvplanit/source/vptasklist.pas
index b76c93008..8d9e4eaea 100644
--- a/components/tvplanit/source/vptasklist.pas
+++ b/components/tvplanit/source/vptasklist.pas
@@ -477,7 +477,9 @@ begin
     VK_ESCAPE:
       begin
         Key := 0;
-        TaskList.EndEdit(Self);
+        Hide;
+        TaskList.SetFocus;
+//        TaskList.EndEdit(Self);
       end;
 
     else
diff --git a/components/tvplanit/source/vpweekview.pas b/components/tvplanit/source/vpweekview.pas
index 2345d392d..60a5a6a50 100644
--- a/components/tvplanit/source/vpweekview.pas
+++ b/components/tvplanit/source/vpweekview.pas
@@ -373,7 +373,8 @@ begin
   VK_ESCAPE:
     begin
       Key := 0;
-      Grid.EndEdit(self);
+      Hide;
+      Grid.SetFocus;
     end;
 
   else