diff --git a/CHANGES b/CHANGES
index 6b5674e61..c8aee0a41 100644
--- a/CHANGES
+++ b/CHANGES
@@ -16,6 +16,7 @@ Bugfixes:
  - GBA DMA: Fix DMA start/end timing
  - Qt: Fix window icon on X11
  - GB, GBA Serialize: Fix loading two states in a row
+ - GBA Video: Fix enabling layers in non-tile modes (fixes mgba.io/i/1317)
 Misc:
  - GBA Video: Improve sprite cycle counting (fixes mgba.io/i/1274)
 
diff --git a/src/gba/renderers/video-software.c b/src/gba/renderers/video-software.c
index 614f9087f..f31239d09 100644
--- a/src/gba/renderers/video-software.c
+++ b/src/gba/renderers/video-software.c
@@ -727,7 +727,8 @@ static void _enableBg(struct GBAVideoSoftwareRenderer* renderer, int bg, bool ac
 	if (!active) {
 		renderer->bg[bg].enabled = 0;
 	} else if (!wasActive && active) {
-		if (renderer->nextY == 0) {
+		if (renderer->nextY == 0 || GBARegisterDISPCNTGetMode(renderer->dispcnt) > 2) {
+			// TODO: Investigate in more depth how switching background works in different modes
 			renderer->bg[bg].enabled = 4;
 		} else {
 			renderer->bg[bg].enabled = 1;