diff --git a/src/BreCalClient/EditTimesControl.xaml b/src/BreCalClient/EditTimesControl.xaml
index 7092d7c..bf5ce84 100644
--- a/src/BreCalClient/EditTimesControl.xaml
+++ b/src/BreCalClient/EditTimesControl.xaml
@@ -16,8 +16,8 @@
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
             <RowDefinition Height="28" />
-            <RowDefinition Height="28" x:Name="rowETA"/>
-            <RowDefinition Height="28" />
+            <RowDefinition Height="28" x:Name="rowETA" />
+            <RowDefinition Height="28" x:Name="rowETD" />
             <RowDefinition Height="28" />
             <RowDefinition Height="28" />
             <RowDefinition Height="28" />
diff --git a/src/BreCalClient/EditTimesControl.xaml.cs b/src/BreCalClient/EditTimesControl.xaml.cs
index 289121e..f021b81 100644
--- a/src/BreCalClient/EditTimesControl.xaml.cs
+++ b/src/BreCalClient/EditTimesControl.xaml.cs
@@ -177,10 +177,13 @@ namespace BreCalClient
                 }
             }
 
-            if (ShipcallModel.Shipcall?.Type == ShipcallType.Shifting)
+            if (ShipcallModel.Shipcall?.Type != ShipcallType.Arrival)
             {
                 this.rowETA.Height = new(0);
-
+            }
+            else
+            {
+                this.rowETD.Height = new(0);
             }
 
             // setting en/dis-abled
diff --git a/src/BreCalClient/EditTimesTerminalControl.xaml b/src/BreCalClient/EditTimesTerminalControl.xaml
index f07a031..a7a86cf 100644
--- a/src/BreCalClient/EditTimesTerminalControl.xaml
+++ b/src/BreCalClient/EditTimesTerminalControl.xaml
@@ -15,8 +15,8 @@
 
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
-            <RowDefinition Height="28" />
-            <RowDefinition Height="28" />
+            <RowDefinition Height="28" x:Name="rowStart"/>
+            <RowDefinition Height="28" x:Name="rowEnd"/>
             <RowDefinition Height="28" />
             <RowDefinition Height="28" />
             <RowDefinition Height="56" />
diff --git a/src/BreCalClient/EditTimesTerminalControl.xaml.cs b/src/BreCalClient/EditTimesTerminalControl.xaml.cs
index c09cd73..ba80394 100644
--- a/src/BreCalClient/EditTimesTerminalControl.xaml.cs
+++ b/src/BreCalClient/EditTimesTerminalControl.xaml.cs
@@ -124,8 +124,12 @@ namespace BreCalClient
                 case ShipcallType.Arrival:
                     this.labelStart.FontWeight = FontWeights.Bold;
                     this.datePickerOperationStart.ContextMenu.IsEnabled = false;
+                    this.rowEnd.Height = new(0);
                     break;
                 case ShipcallType.Departure:
+                    this.rowStart.Height = new(0);
+                    this.labelEnd.FontWeight = FontWeights.Bold;
+                    break;
                 case ShipcallType.Shifting:
                     this.labelEnd.FontWeight = FontWeights.Bold;
                     this.datePickerOperationEnd.ContextMenu.IsEnabled = false;