diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/VDP.Mode4.cs b/src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/VDP.Mode4.cs
index 3688c1b1b9..b21c507125 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/VDP.Mode4.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/VDP.Mode4.cs
@@ -40,7 +40,7 @@ namespace BizHawk.Emulation.Cores.Sega.MasterSystem
 
 			for (int xTile = 0; xTile < 32; xTile++)
 			{
-				if (xTile == 24 && VerticalScrollLock)
+				if (xTile == lock_tile_start && VerticalScrollLock)
 				{
 					vertOffset = ScanLine;
 					yTile = vertOffset / 8;
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/VDP.cs b/src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/VDP.cs
index 0de119f047..4911661aee 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/VDP.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Sega/SMS/VDP.cs
@@ -77,6 +77,10 @@ namespace BizHawk.Emulation.Cores.Sega.MasterSystem
 		private int NameTableMaskBit;
 		private bool JPN_Compat =false;
 
+		// For SMS, the last 8 x-tiles are fixed if vertscroll (reg[0].bit(7)) is set, but on GG it must be
+		// only the last 7 or Fray displays incorrectly
+		private int lock_tile_start;
+
 		// preprocessed state assist stuff.
 		public int[] Palette = new int[32];
 		public byte[] PatternBuffer = new byte[0x8000];
@@ -96,7 +100,9 @@ namespace BizHawk.Emulation.Cores.Sega.MasterSystem
 			if (mode == VdpMode.GameGear) CRAM = new byte[64];
 			DisplayType = displayType;
 			if (mode == VdpMode.SMS) { JPN_Compat = region_compat; }
-			NameTableBase = CalcNameTableBase();	
+			NameTableBase = CalcNameTableBase();
+
+			lock_tile_start = mode == VdpMode.SMS ? 24 : 25;
 		}
 
 		public byte ReadData()