diff --git a/Machine/MachiningDbPageUC.xaml.vb b/Machine/MachiningDbPageUC.xaml.vb
index 8e94186..915a459 100644
--- a/Machine/MachiningDbPageUC.xaml.vb
+++ b/Machine/MachiningDbPageUC.xaml.vb
@@ -359,14 +359,14 @@ Public Class MachiningDbPageUC
       EgtMdbGetCurrMachiningParam(MCH_MP.HEADSIDE, ToolInt)
       HeadSideCmBx.SelectedIndex = ToolInt - 1
       EgtMdbGetCurrMachiningParam(MCH_MP.LEADINTYPE, ToolInt)
-      LeadInTypeCmBx.SelectedIndex = ToolInt
+      LeadInTypeCmBx.SelectedItem = LeadInTypeCmBx.Items(0)
       For Each LInType As IdNameStruct In LeadInTypeCmBx.Items
          If ToolInt = LInType.Id Then LeadInTypeCmBx.SelectedItem = LInType
       Next
       EgtMdbGetCurrMachiningParam(MCH_MP.EXTLINKTYPE, ToolInt)
       ExtLinkTypeCmBx.SelectedIndex = ToolInt
       EgtMdbGetCurrMachiningParam(MCH_MP.LEADOUTTYPE, ToolInt)
-      LeadOutTypeCmBx.SelectedIndex = ToolInt
+      LeadOutTypeCmBx.SelectedItem = LeadOutTypeCmBx.Items(0)
       For Each LOutType As IdNameStruct In LeadOutTypeCmBx.Items
          If ToolInt = LOutType.Id Then LeadOutTypeCmBx.SelectedItem = LOutType
       Next