diff --git a/CHANGES b/CHANGES
index 20b1f3885..f1f42f4a3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,7 @@ Bugfixes:
  - Qt: Fix install path of XDG desktop file with DESTDIR
  - Qt: Fix drag and drop on Windows
  - Qt: Reenable double buffering, as disabling it broke some Windows configs
+ - GBA Video: Start on the scanline BIOS finishes on if no BIOS is loaded
 Misc:
  - Qt: Window size command line options are now supported
  - Qt: Increase usability of key mapper
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ba8c0e3d7..c0a90d84f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,6 +28,7 @@ file(GLOB GBA_SRC ${CMAKE_SOURCE_DIR}/src/gba/*.c)
 file(GLOB GBA_CHEATS_SRC ${CMAKE_SOURCE_DIR}/src/gba/cheats/*.c)
 file(GLOB GBA_RR_SRC ${CMAKE_SOURCE_DIR}/src/gba/rr/*.c)
 file(GLOB GBA_SV_SRC ${CMAKE_SOURCE_DIR}/src/gba/supervisor/*.c)
+file(GLOB GUI_SRC ${CMAKE_SOURCE_DIR}/src/gui/*.c)
 file(GLOB UTIL_SRC ${CMAKE_SOURCE_DIR}/src/util/*.[cSs])
 file(GLOB GUI_SRC ${CMAKE_SOURCE_DIR}/src/util/gui/*.c)
 file(GLOB RENDERER_SRC ${CMAKE_SOURCE_DIR}/src/gba/renderers/*.c)
diff --git a/res/font.png b/res/font.png
index 70adb6bd1..9b0c83e92 100644
Binary files a/res/font.png and b/res/font.png differ
diff --git a/src/gba/video.c b/src/gba/video.c
index fef6e1b54..c70e47a38 100644
--- a/src/gba/video.c
+++ b/src/gba/video.c
@@ -62,7 +62,13 @@ void GBAVideoInit(struct GBAVideo* video) {
 }
 
 void GBAVideoReset(struct GBAVideo* video) {
-	video->vcount = VIDEO_VERTICAL_TOTAL_PIXELS - 1;
+	if (video->p->memory.fullBios) {
+		video->vcount = 0;
+	} else {
+		// TODO: Verify exact scanline hardware
+		video->vcount = 0x7E;
+	}
+	video->p->memory.io[REG_VCOUNT >> 1] = video->vcount;
 
 	video->lastHblank = 0;
 	video->nextHblank = VIDEO_HDRAW_LENGTH;