diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 053fe7728..8fe5514f9 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -3,6 +3,7 @@ D1X-Rebirth Changelog
 20100401
 --------
 arch/include/event.h, arch/sdl/event.c, arch/sdl/key.c, arch/sdl/mouse.c, main/automap.c, main/credits.c, main/game.c, main/gamecntl.c, main/inferno.c, main/kconfig.c, main/kmatrix.c, main/net_ipx.c, main/net_udp.c, main/newmenu.c, main/scores.c, main/titles.c: Add a default event handler for screenshots, entering debugger, Redbook repeating etc
+main/menu.c, main/newmenu.c: Keep demo selector just after playing one, for convenience
 
 20100331
 --------
diff --git a/main/menu.c b/main/menu.c
index 6eb47fc2b..bcad862bf 100644
--- a/main/menu.c
+++ b/main/menu.c
@@ -712,8 +712,7 @@ int demo_menu_handler( listbox *lb, d_event *event, void *userdata )
 				return 0;		// shouldn't happen
 
 			newdemo_start_playback(items[citem]);
-			// return 1;		// later - when the listbox uses the main loop
-			break;
+			return 1;		// stay in demo selector
 			
 		case EVENT_WINDOW_CLOSE:
 			PHYSFS_freeList(items);
diff --git a/main/newmenu.c b/main/newmenu.c
index 15b3f3b5c..dfe616260 100644
--- a/main/newmenu.c
+++ b/main/newmenu.c
@@ -1866,6 +1866,7 @@ int listbox_draw(window *wind, listbox *lb)
 {
 	int i;
 
+	gr_set_current_canvas(NULL);
 	nm_draw_background1(NULL);
 	nm_draw_background( lb->box_x-BORDERX,lb->box_y-lb->title_height-BORDERY,lb->box_x+lb->box_w+BORDERX,lb->box_y+lb->height+BORDERY );
 	gr_set_curfont(MEDIUM3_FONT);