diff --git a/pcbnew/dialogs/dialog_track_via_properties.cpp b/pcbnew/dialogs/dialog_track_via_properties.cpp
index 70fc595c3a..b7fec69038 100644
--- a/pcbnew/dialogs/dialog_track_via_properties.cpp
+++ b/pcbnew/dialogs/dialog_track_via_properties.cpp
@@ -282,7 +282,7 @@ DIALOG_TRACK_VIA_PROPERTIES::DIALOG_TRACK_VIA_PROPERTIES( PCB_BASE_FRAME* aParen
     else
         m_lockedCbox->Set3StateValue( wxCHK_UNCHECKED );
 
-    SetInitialFocus( m_tracks ? m_TrackStartXCtrl : m_ViaXCtrl );
+    SetInitialFocus( m_tracks ? m_TrackWidthCtrl : m_ViaDiameterCtrl );
 
     m_StdButtonsOK->SetDefault();