diff --git a/src/mame/handheld/hh_sm510.cpp b/src/mame/handheld/hh_sm510.cpp
index cbc3c62fe4e..51b07297908 100644
--- a/src/mame/handheld/hh_sm510.cpp
+++ b/src/mame/handheld/hh_sm510.cpp
@@ -6981,7 +6981,7 @@ static INPUT_PORTS_START( tddragon2 )
 	PORT_BIT( 0x09, IP_ACTIVE_HIGH, IPT_UNUSED )
 
 	PORT_START("IN.2") // S3
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_CHANGED_CB(input_changed) PORT_NAME("Down")
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_CHANGED_CB(input_changed) // Down
 	PORT_BIT( 0x0d, IP_ACTIVE_HIGH, IPT_UNUSED )
 
 	PORT_START("IN.3") // S4
diff --git a/src/mame/saitek/ecbackg.cpp b/src/mame/saitek/ecbackg.cpp
index f86625768a8..9c016d8c997 100644
--- a/src/mame/saitek/ecbackg.cpp
+++ b/src/mame/saitek/ecbackg.cpp
@@ -12,9 +12,9 @@ This program got 3rd place in the first Computer Olympiad in 1989 (backgammon
 category). It also includes several game variations like Jacquet or Trictrac.
 
 MAME's sensorboard interface is a bit different compared to chess. Pieces can be
-stacked up to 3. Pressing the Bear Off button (Del / Backspace) will also remove
-the currently held piece. Capturing pieces is disabled, except when hitting a
-blot, in which case the captured piece is held.
+stacked up to 3. Pressing the Bear Off button (Del / Backspace) will optionally
+remove the currently held piece. Capturing pieces is disabled, except when hitting
+a blot, in which case the piece in hand is swapped with the one on the board.
 
 Hardware notes:
 - PCB label: GT4-PE-009
@@ -74,7 +74,7 @@ private:
 	required_device<pwm_display_device> m_lcd_pwm;
 	required_device<pwm_display_device> m_led_pwm;
 	required_device<dac_bit_interface> m_dac;
-	required_ioport_array<5> m_inputs;
+	required_ioport_array<6> m_inputs;
 	output_finder<2, 24> m_out_lcd;
 
 	bool m_power = false;
@@ -210,7 +210,7 @@ u8 ecbackg_state::board_spawn_cb(offs_t offset)
 
 INPUT_CHANGED_MEMBER(ecbackg_state::bear_off)
 {
-	if (newval)
+	if (newval && m_inputs[5]->read() & 1)
 	{
 		// remove piece when Bear Off button is pressed
 		board_remove_cb();
@@ -464,6 +464,11 @@ static INPUT_PORTS_START( ecbackg )
 	PORT_START("IN.4")
 	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_N) PORT_NAME("New Game")
 
+	PORT_START("IN.5")
+	PORT_CONFNAME( 0x01, 0x01, "Remove Piece on Bear Off" )
+	PORT_CONFSETTING(    0x00, DEF_STR( No ) )
+	PORT_CONFSETTING(    0x01, DEF_STR( Yes ) )
+
 	PORT_START("POWER") // needs to be triggered for nvram to work
 	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_CODE(KEYCODE_F1) PORT_CHANGED_MEMBER(DEVICE_SELF, ecbackg_state, power_off, 0) PORT_NAME("Stop")