diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index 71cb119419..758527a623 100644
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-16  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+	* Menubar_pimpl.C (create_submenu): do not create a "More..."
+	submenu just for one entry
+
 2002-10-15  Angus Leeming  <leeming@lyx.org>
 
 	* XWorkArea.C (work_area_handler): Pass the mouse button correctly to
diff --git a/src/frontends/xforms/Menubar_pimpl.C b/src/frontends/xforms/Menubar_pimpl.C
index 0cd25b3aec..042ba49280 100644
--- a/src/frontends/xforms/Menubar_pimpl.C
+++ b/src/frontends/xforms/Menubar_pimpl.C
@@ -250,7 +250,9 @@ int Menubar::Pimpl::create_submenu(Window win, XFormsView * view,
 		string & extra_label = *it;
 
 		++count;
-		if (count > max_number_of_items) {
+		// add a More... submenu if the menu is too long (but
+		// not just for one extra entry!)
+		if (count > max_number_of_items && (i+1) != end) {
 			int tmpmenuid = get_new_submenu(smn, win);
 			lyxerr[Debug::GUI] << "Too many items, creating "
 					   << "new menu " << tmpmenuid << endl;