diff --git a/src/mame/drivers/8080bw.cpp b/src/mame/drivers/8080bw.cpp
index f08104728fb..2876dda5840 100644
--- a/src/mame/drivers/8080bw.cpp
+++ b/src/mame/drivers/8080bw.cpp
@@ -1241,8 +1241,8 @@ static ADDRESS_MAP_START( rollingc_map, AS_PROGRAM, 8, _8080bw_state )
 	AM_RANGE(0x0000, 0x1fff) AM_ROM
 	AM_RANGE(0x2000, 0x3fff) AM_RAM AM_SHARE("main_ram")
 	AM_RANGE(0x4000, 0x5fff) AM_ROM
-	AM_RANGE(0xa000, 0xbfff) /*AM_MIRROR(0x00e0)*/ AM_RAM AM_SHARE("colorram")
-	AM_RANGE(0xe000, 0xffff) /*AM_MIRROR(0x00e0)*/ AM_RAM AM_SHARE("colorram2")
+	AM_RANGE(0xa000, 0xbfff) AM_MASK(0x1f1f) AM_RAM AM_SHARE("colorram")
+	AM_RANGE(0xe000, 0xffff) AM_MASK(0x1f1f) AM_RAM AM_SHARE("colorram2")
 ADDRESS_MAP_END
 
 
@@ -1304,7 +1304,7 @@ static ADDRESS_MAP_START( schaser_map, AS_PROGRAM, 8, _8080bw_state )
 	AM_RANGE(0x0000, 0x1fff) AM_ROM
 	AM_RANGE(0x2000, 0x3fff) AM_RAM AM_SHARE("main_ram")
 	AM_RANGE(0x4000, 0x5fff) AM_ROM
-	AM_RANGE(0xc000, 0xdfff) /*AM_MIRROR(0x0060)*/ AM_RAM AM_SHARE("colorram")
+	AM_RANGE(0xc000, 0xdfff) AM_MASK(0x1f1f) AM_RAM AM_SHARE("colorram")
 ADDRESS_MAP_END
 
 
@@ -1558,7 +1558,7 @@ static ADDRESS_MAP_START( sflush_map, AS_PROGRAM, 8, _8080bw_state )
 	AM_RANGE(0x801a, 0x801a) AM_WRITENOP
 	AM_RANGE(0x801c, 0x801c) AM_WRITENOP
 	AM_RANGE(0x801d, 0x801d) AM_WRITENOP
-	AM_RANGE(0xa000, 0xbfff) /*AM_MIRROR(0x0060)*/ AM_RAM AM_SHARE("colorram")
+	AM_RANGE(0xa000, 0xbfff) AM_MASK(0x1f9f) AM_RAM AM_SHARE("colorram")
 	AM_RANGE(0xd800, 0xffff) AM_ROM
 ADDRESS_MAP_END