diff --git a/src/blackgui/components/airportsmallcompleter.cpp b/src/blackgui/components/airportsmallcompleter.cpp
index 97f9b60b3..8ae4cf518 100644
--- a/src/blackgui/components/airportsmallcompleter.cpp
+++ b/src/blackgui/components/airportsmallcompleter.cpp
@@ -29,6 +29,8 @@ namespace BlackGui
         {
             ui->setupUi(this);
             ui->le_Icao->setValidator(new CUpperCaseValidator(ui->le_Icao));
+            this->setFocusProxy(ui->le_Icao);
+
 
             connect(sGui->getWebDataServices(), &CWebDataServices::swiftDbAllDataRead, this, &CAirportSmallCompleter::onAirportsChanged);
             connect(ui->le_Icao, &QLineEdit::editingFinished, this, &CAirportSmallCompleter::onIcaoChanged);
diff --git a/src/blackgui/editors/pilotform.ui b/src/blackgui/editors/pilotform.ui
index ea77606f2..8aa1889b6 100644
--- a/src/blackgui/editors/pilotform.ui
+++ b/src/blackgui/editors/pilotform.ui
@@ -149,6 +149,7 @@
   <tabstop>le_Password</tabstop>
   <tabstop>pb_UnhidePassword</tabstop>
   <tabstop>le_RealName</tabstop>
+  <tabstop>comp_HomeAirport</tabstop>
  </tabstops>
  <resources>
   <include location="../../blackmisc/blackmisc.qrc"/>