diff --git a/src/dData.pas b/src/dData.pas
index e241641..bd12317 100644
--- a/src/dData.pas
+++ b/src/dData.pas
@@ -766,6 +766,8 @@ begin
 
   dmUtils.LoadBandsSettings;
 
+  frmTRXControl.cmbRig.ItemIndex:=cqrini.ReadInteger('TRX', 'RigInUse', 1);
+  frmTRXControl.cmbRigCloseUp(nil);
   frmTRXControl.InitializeRig;
   frmRotControl.InicializeRot;
 
diff --git a/src/fTRXControl.pas b/src/fTRXControl.pas
index 82dd92b..156d7fc 100644
--- a/src/fTRXControl.pas
+++ b/src/fTRXControl.pas
@@ -1017,9 +1017,6 @@ procedure TfrmTRXControl.FormCreate(Sender : TObject);
 begin
   Radio := nil;
   AutoMode := True;
-  //these are needed here otherwise rig init at startup, if TRXControl window stays closed, fails
-  cmbRig.ItemIndex:=cqrini.ReadInteger('TRX', 'RigInUse', 1);
-  cmbRigCloseUp(nil); //defaults rig 1 in case of undefined
 end;
 
 procedure TfrmTRXControl.FormDestroy(Sender : TObject);