diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input
index fff07ee77f..4a9f4f2ecd 100644
--- a/firmware/tunerstudio/rusefi.input
+++ b/firmware/tunerstudio/rusefi.input
@@ -2883,13 +2883,12 @@ cmd_set_engine_type_default					= "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00"
 
 
 ;			Board->Connection
-	dialog = tsPort, "TunerStudio Port"
-		field = "tunerStudioSerialSpeed",				tunerStudioSerialSpeed
+	dialog = tsPort, "Secondary Serial"
 		field = "Use UART/TTL serial?",					useSerialPort
+		field = "tunerStudioSerialSpeed",				tunerStudioSerialSpeed, {useSerialPort == 1}
 		field = "TX pin",                               binarySerialTxPin, {useSerialPort == 1}
 		field = "RX pin",                               binarySerialRxPin, {useSerialPort == 1}
-		field = "uartConsoleSerialSpeed",				uartConsoleSerialSpeed
-		
+
 	dialog = canBus, "CAN Bus"
 		field = "Can Read Enabled",						canReadEnabled
 		field = "Can Write Enabled",					canWriteEnabled
@@ -2921,8 +2920,7 @@ cmd_set_engine_type_default					= "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00"
 	dialog = auxSerial, "AUX Serial"
 		field = "RX pin",								auxSerialRxPin @@if_ts_show_auxserial_pins
 		field = "TX pin",								auxSerialTxPin @@if_ts_show_auxserial_pins
-		; we want to show baud rate even if pins are hard-coded like on microRusEFI
-		field = "Serial Baud Rate",						auxSerialSpeed
+		field = "Serial Baud Rate",						auxSerialSpeed @@if_ts_show_auxserial_pins
 	
 	dialog = sdCard, "SD Card Logger"
 		field = "Enable SD Card",						isSdCardEnabled
@@ -2958,6 +2956,7 @@ cmd_set_engine_type_default					= "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00"
 	dialog = connection, "", 	yAxis
 		field = "ADC vRef voltage",						adcVcc
 		panel = tsPort							@@if_ts_show_tunerstudio_port
+		field = "uartConsoleSerialSpeed",				uartConsoleSerialSpeed
 		panel = auxSerial
 		panel = gpsReceiver                       @@if_ts_show_gps