Index: kernel/arch/ia32/src/boot/vesa_real.inc
===================================================================
--- kernel/arch/ia32/src/boot/vesa_real.inc	(revision 485f89958a5e3b92ee713c9858b48eae2f7c3048)
+++ kernel/arch/ia32/src/boot/vesa_real.inc	(revision 36aec61ed4ea92750995d2823370a5f19b89a6b3)
@@ -364,5 +364,28 @@
 
 		/* No prefered mode found */
-
+		push %di
+		mov $e_vesa_init - vesa_init, %di
+		mov 2 + VESA_MODE_LIST_PTR_OFFSET(%di), %si
+		mov %si, %gs
+		mov VESA_MODE_LIST_PTR_OFFSET(%di), %si
+		pop %di
+
+		/* Check if list of supported modes contains fallback mode */
+	find_fallback_mode:
+
+		mov %gs:(%si), %cx
+
+		cmp $0x111, %cx
+		je fallback_mode_listed
+
+		cmp $VESA_END_OF_MODES, %cx
+		je text_mode
+
+		inc %si
+		inc %si
+		jmp find_fallback_mode /* 16-bit relative jump */
+
+	fallback_mode_listed:
+		/* Make sure fallback mode is really supported */
 		mov $0x111, %cx
 		push %di
@@ -375,5 +398,11 @@
 		cmp $VESA_OK, %ax
 		jnz text_mode
-		jz set_mode  /* force relative jump */
+
+		/* Verify mode attributes */
+		and $0x99, %ax
+		cmp $0x99, %ax
+		jne text_mode
+
+		jmp set_mode  /* 16-bit relative jump */
 
 	text_mode: