diff --git a/src/frontends/gtk/ChangeLog b/src/frontends/gtk/ChangeLog
index c0189e6fa6..c4d4ea96ad 100644
--- a/src/frontends/gtk/ChangeLog
+++ b/src/frontends/gtk/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-31  John Spray  <spray_john@users.sf.net>
+	* GToc.C: unbreak viewing lists other than TOC by storing 
+	integer index of entries in Type combobox.
+
 2005-07-28  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
 	* GViewBase.C (show): exit after update if Controller::exitEarly()
diff --git a/src/frontends/gtk/GToc.C b/src/frontends/gtk/GToc.C
index 8d473fccf8..19c0876b71 100644
--- a/src/frontends/gtk/GToc.C
+++ b/src/frontends/gtk/GToc.C
@@ -100,10 +100,14 @@ void GToc::updateType()
 
 	vector<string>::iterator it = types.begin();
 	vector<string>::iterator end = types.end();
+	int index = 0;
 	for(;it != end; ++it) {
 		string const & guiname = controller().getGuiName(*it);
 		Gtk::TreeModel::iterator row = typestore_->append();
 		(*row)[listCol_] = guiname;
+		(*row)[listColIndex_] = index;
+		++index;
+
 		if (*it == targettype)
 			typecombo_->set_active(row);
 	}