Index: trunk/i386/boot2/boot.c
===================================================================
--- trunk/i386/boot2/boot.c	(revision 368)
+++ trunk/i386/boot2/boot.c	(revision 369)
@@ -379,11 +379,6 @@
 		
         // Other status (e.g. 0) means that we should proceed with boot.
 		
-		if( bootArgs->Video.v_display == GRAPHICS_MODE )
-			drawBackground();
-			
-        // Found and loaded a config file. Proceed with boot.
-
 		// Turn off any GUI elements
 		if( bootArgs->Video.v_display == GRAPHICS_MODE )
 		{
@@ -391,6 +386,7 @@
 			gui.bootprompt.draw = false;
 			gui.menu.draw = false;
 			gui.infobox.draw = false;
+			gui.logo.draw = false;
 			drawBackground();
 			updateVRAM();
 		}
@@ -564,12 +560,8 @@
         if (ret <= 0) {
 			printf("Can't find %s\n", bootFile);
 
-			if(gui.initialised) {
-				sleep(1);
-				drawBackground();
-				gui.devicelist.draw = true;
-				gui.redraw = true;
-			}
+			sleep(1);
+
             if (gBootFileType == kNetworkDeviceType) {
                 // Return control back to PXE. Don't unload PXE base code.
                 gUnloadPXEOnExit = false;
Index: trunk/i386/boot2/gui.c
===================================================================
--- trunk/i386/boot2/gui.c	(revision 368)
+++ trunk/i386/boot2/gui.c	(revision 369)
@@ -439,7 +439,10 @@
 	blend( images[iBackground].image, gui.screen.pixmap, gui.background.pos );
 	
 	// draw logo.png into background buffer
-	blend( images[iLogo].image, gui.screen.pixmap, gui.logo.pos);
+	if (gui.logo.draw)
+	{
+    	blend( images[iLogo].image, gui.screen.pixmap, gui.logo.pos);
+	}
 	
 	memcpy( gui.backbuffer->pixels, gui.screen.pixmap->pixels, gui.backbuffer->width * gui.backbuffer->height * 4 );
 }
@@ -699,7 +702,8 @@
 				if (createWindowBuffer(&gui.devicelist) == 0) {
 					if (createWindowBuffer(&gui.bootprompt) == 0) {
 						if (createWindowBuffer(&gui.infobox) == 0) {
-							if (createWindowBuffer(&gui.menu) == 0) {							
+							if (createWindowBuffer(&gui.menu) == 0) {
+							    gui.logo.draw = true;
 								drawBackground();
 								// lets copy the screen into the back buffer
 								memcpy( gui.backbuffer->pixels, gui.screen.pixmap->pixels, gui.backbuffer->width * gui.backbuffer->height * 4 );
Index: trunk/i386/boot2/options.c
===================================================================
--- trunk/i386/boot2/options.c	(revision 368)
+++ trunk/i386/boot2/options.c	(revision 369)
@@ -866,6 +866,7 @@
 
 	if (bootArgs->Video.v_display == GRAPHICS_MODE) {
 		// redraw the background buffer
+		gui.logo.draw = true;
 		drawBackground();
 		gui.devicelist.draw = true;
 		gui.redraw = true;