diff --git a/ChangeLog b/ChangeLog
index 88b63eb7cf..155e3717dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-05-20  Sven Neumann  <sven@gimp.org>
+
+	* libgimpwidgets/gimpcolorselection.c: put the hex entry above the
+	color history again.
+
+	* libgimpwidgets/gimpcolorscales.c: do not allocate row spacing
+	for the alpha row if it isn't visible.
+
 2005-05-19  Manish Singh  <yosh@gimp.org>
 
 	* plug-ins/jpeg/jpeg-save.c (save_image): don't do pointer arithmetic
diff --git a/libgimpwidgets/gimpcolorscales.c b/libgimpwidgets/gimpcolorscales.c
index b5e0e6a66b..7af8b7924b 100644
--- a/libgimpwidgets/gimpcolorscales.c
+++ b/libgimpwidgets/gimpcolorscales.c
@@ -173,7 +173,6 @@ gimp_color_scales_init (GimpColorScales *scales)
   table = gtk_table_new (7, 4, FALSE);
   gtk_table_set_row_spacings (GTK_TABLE (table), 1);
   gtk_table_set_row_spacing (GTK_TABLE (table), 2, 3); /* hsv <-> rgb   */
-  gtk_table_set_row_spacing (GTK_TABLE (table), 5, 3); /* rgb <-> alpha */
   gtk_table_set_col_spacings (GTK_TABLE (table), 2);
   gtk_table_set_col_spacing (GTK_TABLE (table), 0, 0);
   gtk_box_pack_start (GTK_BOX (scales), table, FALSE, FALSE, 0);
@@ -262,11 +261,17 @@ gimp_color_scales_set_show_alpha (GimpColorSelector *selector,
   GtkWidget       *label;
   GtkWidget       *scale;
   GtkWidget       *spin;
+  GtkWidget       *table;
 
   label = GIMP_SCALE_ENTRY_LABEL (scales->slider_data[6]);
   scale = GIMP_SCALE_ENTRY_SCALE (scales->slider_data[6]);
   spin  = GIMP_SCALE_ENTRY_SPINBUTTON (scales->slider_data[6]);
 
+  table = gtk_widget_get_parent (scale);
+  if (GTK_IS_TABLE (table))
+    gtk_table_set_row_spacing (GTK_TABLE (table), 5, /* rgb <-> alpha */
+                               show_alpha ? 3 : 0);
+
   if (show_alpha)
     {
       gtk_widget_show (label);
diff --git a/libgimpwidgets/gimpcolorselection.c b/libgimpwidgets/gimpcolorselection.c
index dbb378733c..f6552268a3 100644
--- a/libgimpwidgets/gimpcolorselection.c
+++ b/libgimpwidgets/gimpcolorselection.c
@@ -273,7 +273,7 @@ gimp_color_selection_init (GimpColorSelection *selection)
 
   /* The hex triplet entry */
   hbox = gtk_hbox_new (FALSE, 6);
-  gtk_box_pack_end (GTK_BOX (selection->right_vbox), hbox, FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (selection->right_vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
   entry = gimp_color_hex_entry_new ();