diff --git a/src/blackgui/components/logincomponent.cpp b/src/blackgui/components/logincomponent.cpp
index 19a702221..84d1f8de9 100644
--- a/src/blackgui/components/logincomponent.cpp
+++ b/src/blackgui/components/logincomponent.cpp
@@ -442,13 +442,15 @@ namespace BlackGui
             if (simulating)
             {
                 model = sGui->getIContextOwnAircraft()->getOwnAircraft().getModel();
-                ui->le_SimulatorModel->setText(model.getModelStringAndDbKey());
+                const QString modelAndKey(model.getModelStringAndDbKey());
+                ui->le_SimulatorModel->setText(modelAndKey);
+                ui->le_SimulatorModel->home(false);
                 this->highlightModelField(model);
             }
             else
             {
                 model = this->getPrefillModel();
-                ui->le_SimulatorModel->setText("");
+                ui->le_SimulatorModel->clear();
                 this->highlightModelField();
             }
             ui->le_SimulatorModel->setToolTip(model.asHtmlSummary());
diff --git a/src/blackgui/components/logincomponent.ui b/src/blackgui/components/logincomponent.ui
index 3b6e352c6..042dfe89f 100644
--- a/src/blackgui/components/logincomponent.ui
+++ b/src/blackgui/components/logincomponent.ui
@@ -728,11 +728,25 @@
   </customwidget>
  </customwidgets>
  <tabstops>
+  <tabstop>tw_Network</tabstop>
+  <tabstop>comp_VatsimServers</tabstop>
+  <tabstop>pb_OverrideCredentialsVatsim</tabstop>
+  <tabstop>le_SimulatorModel</tabstop>
+  <tabstop>tb_SimulatorIcaoReverseLookup</tabstop>
+  <tabstop>tb_MappingWizard</tabstop>
   <tabstop>le_Callsign</tabstop>
   <tabstop>selector_AircraftIcao</tabstop>
   <tabstop>le_AircraftCombinedType</tabstop>
   <tabstop>selector_AirlineIcao</tabstop>
+  <tabstop>le_LoginAsAircaft</tabstop>
+  <tabstop>le_HomeBase</tabstop>
+  <tabstop>le_LoginSince</tabstop>
+  <tabstop>tb_Timeout</tabstop>
+  <tabstop>pb_Ok</tabstop>
+  <tabstop>pb_Cancel</tabstop>
   <tabstop>comp_OtherServers</tabstop>
+  <tabstop>pb_OtherServersGotoSettings</tabstop>
+  <tabstop>pb_OverrideCredentialsOtherServers</tabstop>
  </tabstops>
  <resources>
   <include location="../../blackmisc/blackmisc.qrc"/>