diff --git a/src/BreCalClient/EditShipcallControl.xaml.cs b/src/BreCalClient/EditShipcallControl.xaml.cs
index 65ae975..745151b 100644
--- a/src/BreCalClient/EditShipcallControl.xaml.cs
+++ b/src/BreCalClient/EditShipcallControl.xaml.cs
@@ -222,6 +222,8 @@ namespace BreCalClient
                             isEnabled &= (this.datePickerETD.Value.Value > DateTime.Now);
                         if (this.datePickerETA.Value.HasValue)
                             isEnabled &= (this.datePickerETA.Value.Value > DateTime.Now);
+                        if (this.datePickerETA.Value.HasValue && this.datePickerETD.Value.HasValue)
+                            isEnabled &= (this.datePickerETA.Value.Value > this.datePickerETD.Value.Value);
                         break;
                 }
             }