diff --git a/src/frontends/gtk/ChangeLog b/src/frontends/gtk/ChangeLog
index af46e465ef..24b28c16ab 100644
--- a/src/frontends/gtk/ChangeLog
+++ b/src/frontends/gtk/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-29  John Spray  <spray_john@users.sourceforge.net>
+
+	* GToolbar.C: Make layouts combobox not expand to full height 
+		of toolbar, it looks more like a combobox this way.
+
 2004-11-26  John Spray  <spray_john@users.sourceforge.net>
 	
 	* FileDialogPrivate.[Ch]: use Gtk::FileChooser, add 
diff --git a/src/frontends/gtk/GToolbar.C b/src/frontends/gtk/GToolbar.C
index 081dacb489..b2cb0a6438 100644
--- a/src/frontends/gtk/GToolbar.C
+++ b/src/frontends/gtk/GToolbar.C
@@ -79,15 +79,15 @@ GLayoutBox::GLayoutBox(LyXView & owner,
 	// causes the first update()
 	combo_.set_size_request(130,-1);
 
-
 	combo_.set_data(
 		gToolData,
 		reinterpret_cast<void*>(&const_cast<FuncRequest &>(func)));
 
-	combo_.show();
+	Gtk::VBox * vbox = Gtk::manage(new Gtk::VBox);
+	vbox->pack_end(combo_, Gtk::PACK_EXPAND_PADDING);
 
 	Gtk::ToolItem * toolitem = Gtk::manage(new Gtk::ToolItem);
-	toolitem->add(combo_);
+	toolitem->add(*vbox);
 	toolbar.append(*toolitem);
 }