diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index da89eb5f4..c209d2c6e 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,9 @@
 D1X-Rebirth Changelog
 
+20100206
+--------
+main/newmenu.c: Set the correct scroll position for the listbox when it's shown
+
 20100205
 --------
 main/game.c, main/gameseq.c, main/newdemo.c: Use palette_save and palette_restore for all windows displayed over Game_wind, not just for do_option
diff --git a/main/newmenu.c b/main/newmenu.c
index 61b551ebf..ea1680efa 100644
--- a/main/newmenu.c
+++ b/main/newmenu.c
@@ -1723,6 +1723,28 @@ void listbox_delete_item(listbox *lb, int item)
 	}
 }
 
+void update_scroll_position(listbox *lb)
+{
+	if (lb->citem<0)
+		lb->citem=0;
+	
+	if (lb->citem>=lb->nitems)
+		lb->citem = lb->nitems-1;
+	
+	if (lb->citem< lb->first_item)
+		lb->first_item = lb->citem;
+	
+	if (lb->citem>=( lb->first_item+LB_ITEMS_ON_SCREEN))
+		lb->first_item = lb->citem-LB_ITEMS_ON_SCREEN+1;
+	
+	if (lb->nitems <= LB_ITEMS_ON_SCREEN )
+		lb->first_item = 0;
+	
+	if (lb->first_item>lb->nitems-LB_ITEMS_ON_SCREEN)
+		lb->first_item = lb->nitems-LB_ITEMS_ON_SCREEN;
+	if (lb->first_item < 0 ) lb->first_item = 0;
+}
+
 int listbox_key_command(window *wind, d_event *event, listbox *lb)
 {
 	int key = ((d_event_keycommand *)event)->keycode;
@@ -1806,24 +1828,7 @@ int listbox_key_command(window *wind, d_event *event, listbox *lb)
 		}
 	}
 	
-	if (lb->citem<0)
-		lb->citem=0;
-	
-	if (lb->citem>=lb->nitems)
-		lb->citem = lb->nitems-1;
-	
-	if (lb->citem< lb->first_item)
-		lb->first_item = lb->citem;
-	
-	if (lb->citem>=( lb->first_item+LB_ITEMS_ON_SCREEN))
-		lb->first_item = lb->citem-LB_ITEMS_ON_SCREEN+1;
-	
-	if (lb->nitems <= LB_ITEMS_ON_SCREEN )
-		lb->first_item = 0;
-	
-	if (lb->first_item>lb->nitems-LB_ITEMS_ON_SCREEN)
-		lb->first_item = lb->nitems-LB_ITEMS_ON_SCREEN;
-	if (lb->first_item < 0 ) lb->first_item = 0;
+	update_scroll_position(lb);
 	
 	return rval;
 }
@@ -2049,6 +2054,7 @@ int newmenu_listbox1( char * title, int nitems, char * items[], int allow_abort_
 	if ( lb->citem >= nitems ) lb->citem = 0;
 
 	lb->first_item = 0;
+	update_scroll_position(lb);
 
 	lb->mouse_state = lb->omouse_state = 0;	//dblclick_flag = 0;