Index: main_gui.c
===================================================================
--- main_gui.c	(revision 3411)
+++ main_gui.c	(working copy)
@@ -930,10 +930,12 @@
 
 static void ToolbarBuildRailClick(Window *w)
 {
-	const Player* p = GetPlayer(_local_player);
+    const Player* p = GetPlayer(_local_player);
+    int i;
 	Window *w2;
+	for(i = 0; !HasRailtypeAvail(p, _last_built_railtype - i); i++);
 	w2 = PopupMainToolbMenu(w, 457, 19, STR_1015_RAILROAD_CONSTRUCTION, RAILTYPE_END, ~p->avail_railtypes);
-	WP(w2,menu_d).sel_index = _last_built_railtype;
+	WP(w2,menu_d).sel_index = _last_built_railtype - i;
 }
 
 static void ToolbarBuildRoadClick(Window *w)