diff --git a/CHANGES b/CHANGES
index 0d07bf382..67f87da77 100644
--- a/CHANGES
+++ b/CHANGES
@@ -14,6 +14,7 @@ Bugfixes:
  - Qt: Fix directory set unloading when replacing the ROM
  - GBA Savedata: Fix loading savestates with 512Mb Flash saves
  - Core: Fix importing save games as read-only
+ - Util: Fix PNG identification on files too small to be a PNG
 Misc:
  - All: Only update version info if needed
  - FFmpeg: Encoding cleanup
diff --git a/src/util/png-io.c b/src/util/png-io.c
index 5e2f69425..bac188c8d 100644
--- a/src/util/png-io.c
+++ b/src/util/png-io.c
@@ -116,7 +116,9 @@ void PNGWriteClose(png_structp png, png_infop info) {
 
 bool isPNG(struct VFile* source) {
 	png_byte header[PNG_HEADER_BYTES];
-	source->read(source, header, PNG_HEADER_BYTES);
+	if (source->read(source, header, PNG_HEADER_BYTES) < PNG_HEADER_BYTES) {
+		return false;
+	}
 	return !png_sig_cmp(header, 0, PNG_HEADER_BYTES);
 }