diff --git a/ChangeLog b/ChangeLog
index 8a46e60db2..1bb1c2c072 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-12-03  Sven Neumann  <sven@gimp.org>
+
+	* libgimp/gimpunitmenu.c (gimp_unit_menu_new): set empty menu_items
+	used as separators insensitive. Something seems to be wrong in GTK+
+	when it comes to separators in option_menus. This change seems to 
+	work around this problem.
+
 2000-12-03  Sven Neumann  <sven@gimp.org>
 
 	* PLUGIN_MAINTAINERS: changed email address of Wolfgang Hofer
diff --git a/libgimp/gimpunitmenu.c b/libgimp/gimpunitmenu.c
index 2e60a3ed88..f3145bbc0b 100644
--- a/libgimp/gimpunitmenu.c
+++ b/libgimp/gimpunitmenu.c
@@ -195,6 +195,7 @@ gimp_unit_menu_new (const gchar *format,
 	    {
 	      menuitem = gtk_menu_item_new ();
 	      gtk_menu_append (GTK_MENU (menu), menuitem);
+	      gtk_widget_set_sensitive (menuitem, FALSE);
 	      gtk_widget_show (menuitem);
 	    }
 	}
@@ -215,6 +216,7 @@ gimp_unit_menu_new (const gchar *format,
     {
       menuitem = gtk_menu_item_new ();
       gtk_menu_append (GTK_MENU (menu), menuitem);
+      gtk_widget_set_sensitive (menuitem, FALSE);
       gtk_widget_show (menuitem);
       
       menuitem =
@@ -232,6 +234,7 @@ gimp_unit_menu_new (const gchar *format,
     {
       menuitem = gtk_menu_item_new ();
       gtk_menu_append (GTK_MENU (menu), menuitem);
+      gtk_widget_set_sensitive (menuitem, FALSE);
       gtk_widget_show (menuitem);
 
       menuitem =
@@ -573,9 +576,10 @@ gimp_unit_menu_create_selection (GimpUnitMenu *gum)
 
   if (gum->unit >= GIMP_UNIT_END)
     {
-      gtk_clist_select_row (GTK_CLIST (gum->clist), gum->unit - GIMP_UNIT_END, 0);
-      gtk_clist_moveto (GTK_CLIST (gum->clist), gum->unit - GIMP_UNIT_END,
-			0, 0.0, 0.0); 
+      gtk_clist_select_row (GTK_CLIST (gum->clist), 
+			    gum->unit - GIMP_UNIT_END, 0);
+      gtk_clist_moveto (GTK_CLIST (gum->clist), 
+			gum->unit - GIMP_UNIT_END, 0, 0.0, 0.0); 
     }
 }
 
diff --git a/libgimpwidgets/gimpunitmenu.c b/libgimpwidgets/gimpunitmenu.c
index 2e60a3ed88..f3145bbc0b 100644
--- a/libgimpwidgets/gimpunitmenu.c
+++ b/libgimpwidgets/gimpunitmenu.c
@@ -195,6 +195,7 @@ gimp_unit_menu_new (const gchar *format,
 	    {
 	      menuitem = gtk_menu_item_new ();
 	      gtk_menu_append (GTK_MENU (menu), menuitem);
+	      gtk_widget_set_sensitive (menuitem, FALSE);
 	      gtk_widget_show (menuitem);
 	    }
 	}
@@ -215,6 +216,7 @@ gimp_unit_menu_new (const gchar *format,
     {
       menuitem = gtk_menu_item_new ();
       gtk_menu_append (GTK_MENU (menu), menuitem);
+      gtk_widget_set_sensitive (menuitem, FALSE);
       gtk_widget_show (menuitem);
       
       menuitem =
@@ -232,6 +234,7 @@ gimp_unit_menu_new (const gchar *format,
     {
       menuitem = gtk_menu_item_new ();
       gtk_menu_append (GTK_MENU (menu), menuitem);
+      gtk_widget_set_sensitive (menuitem, FALSE);
       gtk_widget_show (menuitem);
 
       menuitem =
@@ -573,9 +576,10 @@ gimp_unit_menu_create_selection (GimpUnitMenu *gum)
 
   if (gum->unit >= GIMP_UNIT_END)
     {
-      gtk_clist_select_row (GTK_CLIST (gum->clist), gum->unit - GIMP_UNIT_END, 0);
-      gtk_clist_moveto (GTK_CLIST (gum->clist), gum->unit - GIMP_UNIT_END,
-			0, 0.0, 0.0); 
+      gtk_clist_select_row (GTK_CLIST (gum->clist), 
+			    gum->unit - GIMP_UNIT_END, 0);
+      gtk_clist_moveto (GTK_CLIST (gum->clist), 
+			gum->unit - GIMP_UNIT_END, 0, 0.0, 0.0); 
     }
 }