diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt
index bdd4411976..b69974f33d 100644
--- a/firmware/integration/rusefi_config.txt
+++ b/firmware/integration/rusefi_config.txt
@@ -214,6 +214,7 @@ struct_no_prefix engine_configuration_s
 #define TPS_TPS_ACCEL_TABLE 8
 #define MAP_ACCEL_TAPER 8
 #define ADC_CHANNEL_NONE 0
+#define ETB_FUNCTION_NONE 0
 
 #define BARO_CORR_SIZE 4
 
diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input
index 7e743b3dcb..ef30a4b4b8 100644
--- a/firmware/tunerstudio/rusefi.input
+++ b/firmware/tunerstudio/rusefi.input
@@ -2639,7 +2639,8 @@ cmd_set_engine_type_default					= "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00"
 		field = "Stepper parking extra steps, %",		stepperParkingExtraSteps, useStepperIdle
 		field = "Force parking every restart",			stepperForceParkingEveryRestart, useStepperIdle
 		panel = idleStepperHw, { useStepperIdle && !useHbridgesToDriveIdleStepper }
-		panel = hbridgeHardware, { useStepperIdle && useHbridgesToDriveIdleStepper }
+        ; todo: reminder that enable condition has to match in both usages of hbridgeHardware due to TS defect?
+		panel = hbridgeHardware,						{ etbFunctions1 != ETB_FUNCTION_NONE || etbFunctions2 = ETB_FUNCTION_NONE || (useStepperIdle && useHbridgesToDriveIdleStepper) }
 
 	dialog = idleHwType, "Idle Valve Hardware",	border
 		panel = idleSolenoid,				West
@@ -3384,7 +3385,8 @@ cmd_set_engine_type_default					= "@@TS_IO_TEST_COMMAND_char@@\x00\x31\x00\x00"
 		; we need the term about stepper idle in here, because there's a bug in TS that you can't have different visibility
 		; criteria for the same panel when used in multiple places
 		; todo: report bug to TS?
-		panel = hbridgeHardware,						{ throttlePedalPositionAdcChannel != @@ADC_CHANNEL_NONE@@ || (useStepperIdle && useHbridgesToDriveIdleStepper) }
+		; another todo: split panel into two panels so that we can enable/disable h-bridge #1 separately from h-bridge #2
+		panel = hbridgeHardware,						{ etbFunctions1 != ETB_FUNCTION_NONE || etbFunctions2 = ETB_FUNCTION_NONE || (useStepperIdle && useHbridgesToDriveIdleStepper) }
 
 	dialog = etbAutotune, "PID Autotune"
 		field = "First step: calibrate TPS and hit 'Burn'"