diff --git a/src/mame/drivers/btime.c b/src/mame/drivers/btime.c
index 555dcacb4d1..3b8a687b8b3 100644
--- a/src/mame/drivers/btime.c
+++ b/src/mame/drivers/btime.c
@@ -770,9 +770,11 @@ static INPUT_PORTS_START( zoar )
 	PORT_DIPNAME( 0x40, 0x00, "Control Panel" ) PORT_DIPLOCATION("SW1:7")
 	PORT_DIPSETTING(    0x00, DEF_STR( Upright ) )
 	PORT_DIPSETTING(    0x40, DEF_STR( Cocktail ) )
-	PORT_DIPNAME( 0x80, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW1:8")
-	PORT_DIPSETTING(    0x00, DEF_STR( Upright ) )
-	PORT_DIPSETTING(    0x80, DEF_STR( Cocktail ) )
+//  PORT_DIPNAME( 0x80, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW1:8")
+//  PORT_DIPSETTING(    0x00, DEF_STR( Upright ) )
+//  PORT_DIPSETTING(    0x80, DEF_STR( Cocktail ) )
+	/* I can't use IPT_VBLANK as players would have almost no time to enter their initials */
+	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_SPECIAL )
 
 	PORT_START("DSW2")
 	PORT_DIPNAME( 0x01, 0x01, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:1")
diff --git a/src/mame/video/btime.c b/src/mame/video/btime.c
index 1efb124ee84..c8865450521 100644
--- a/src/mame/video/btime.c
+++ b/src/mame/video/btime.c
@@ -250,19 +250,6 @@ WRITE8_HANDLER( bnj_scroll2_w )
 	state->bnj_scroll2 = data;
 }
 
-WRITE8_HANDLER( zoar_video_control_w )
-{
-	btime_state *state = (btime_state *)space->machine->driver_data;
-	// Zoar video control
-	//
-	// Bit 0-2 = Unknown (always 0). Marked as MCOL on schematics
-	// Bit 3-4 = Palette
-	// Bit 7   = Flip Screen
-
-	state->btime_palette = (data & 0x30) >> 3;
-	flip_screen_set(space->machine, data & 0x80);
-}
-
 WRITE8_HANDLER( btime_video_control_w )
 {
 	// Btime video control
@@ -289,6 +276,21 @@ WRITE8_HANDLER( bnj_video_control_w )
 		btime_video_control_w(space, offset, data);
 }
 
+WRITE8_HANDLER( zoar_video_control_w )
+{
+	btime_state *state = (btime_state *)space->machine->driver_data;
+	// Zoar video control
+	//
+	// Bit 0-2 = Unknown (always 0). Marked as MCOL on schematics
+	// Bit 3-4 = Palette
+	// Bit 7   = Flip Screen
+
+	state->btime_palette = (data & 0x30) >> 3;
+
+	if (input_port_read(space->machine, "DSW1") & 0x40) /* cocktail mode */
+		flip_screen_set(space->machine, data & 0x80);
+}
+
 WRITE8_HANDLER( disco_video_control_w )
 {
 	btime_state *state = (btime_state *)space->machine->driver_data;