diff --git a/components/tvplanit/source/vpweekview.pas b/components/tvplanit/source/vpweekview.pas
index 18d3d7206..5df4813c1 100644
--- a/components/tvplanit/source/vpweekview.pas
+++ b/components/tvplanit/source/vpweekview.pas
@@ -1940,8 +1940,7 @@ begin
         FAfterEdit(self, ActiveEvent);
       DataStore.PostEvents;
     end;
-    wvInPlaceEditor.Free;
-    wvInPlaceEditor := nil;
+    FreeAndNil(wvInPlaceEditor);
     Invalidate;
 //    SetFocus;
   end;