diff --git a/src/BreCalClient/EditShipcallControl.xaml.cs b/src/BreCalClient/EditShipcallControl.xaml.cs
index 1bcb02a..763994a 100644
--- a/src/BreCalClient/EditShipcallControl.xaml.cs
+++ b/src/BreCalClient/EditShipcallControl.xaml.cs
@@ -359,9 +359,9 @@ namespace BreCalClient
                     }
                 }
 
-                if (BreCalLists.PortLookupDict.ContainsKey(this.ShipcallModel.Shipcall.PortId))
-                    this.comboBoxHarbour.SelectedValue = this.ShipcallModel.Shipcall.PortId;
                 this.comboBoxHarbour.SelectionChanged += this.comboBoxHarbour_SelectionChanged;
+                if (BreCalLists.PortLookupDict.ContainsKey(this.ShipcallModel.Shipcall.PortId))                
+                    this.comboBoxHarbour.SelectedValue = this.ShipcallModel.Shipcall.PortId;                                
 
                 this.comboBoxHarbour.IsEnabled = this.ShipcallModel.AllowPortChange;
             }