diff --git a/components/tvplanit/source/design/vpnabed.pas b/components/tvplanit/source/design/vpnabed.pas
index 35648962a..9e4797fd0 100644
--- a/components/tvplanit/source/design/vpnabed.pas
+++ b/components/tvplanit/source/design/vpnabed.pas
@@ -327,7 +327,7 @@ end;
 procedure TfrmNavBarEd.FormShow(Sender: TObject);
 var
   delta: Integer;
-  h: Integer;
+  h: Integer = 0;
 begin
   PopulateImagesList;
   delta := lbFolders.Left;
@@ -599,7 +599,9 @@ procedure TfrmNavBarEd.lbItemsMeasureItem(Control: TWinControl;
 begin
   Unused(Control, Index);
   if (FBar <> nil) and (Bar.Images <> nil) then
-    Height := Bar.Images.Height + 2 * vITEMS_MARGIN;
+    Height := Bar.Images.Height + 2 * vITEMS_MARGIN
+  else
+    Height := lbItems.ItemHeight;
 end;
 
 procedure TfrmNavBarEd.lbItemsDrawItem(Control: TWinControl;
diff --git a/components/tvplanit/source/vpdayviewpainter.pas b/components/tvplanit/source/vpdayviewpainter.pas
index 53e5344bc..b463e3f8d 100644
--- a/components/tvplanit/source/vpdayviewpainter.pas
+++ b/components/tvplanit/source/vpdayviewpainter.pas
@@ -1125,6 +1125,16 @@ begin
     dvWeekUpBtn.Visible := FShowNavButtons;
     dvWeekDownBtn.Visible := FShowNavButtons;
 
+    { In order to hide the nav btns in designmode move them out of their parent }
+    if (csDesigning in ComponentState) and not FShowNavButtons then begin
+      dvTodayBtn.Left := -Width;
+      dvWeekDownBtn.Left := -Width;
+      dvWeekUpBtn.Left := -Width;
+      dvDayDownBtn.Left := -Width;
+      dvDayUpBtn.Left := -Width;
+      exit;
+    end;
+
     { Calculate width of buttons }
     dvTodayBtn.Height := trunc(RealColHeadHeight div 2);
     dvTodayBtn.Width := RealRowHeadWidth;