diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c
index 029849817c..7f9a1f0345 100644
--- a/gtk/gtkcolorsel.c
+++ b/gtk/gtkcolorsel.c
@@ -33,6 +33,7 @@
 #include <string.h>
 
 #include "gdk/gdk.h"
+#include "gtkorientable.h"
 #include "gtkhsv.h"
 #include "gtkwindow.h"
 #include "gtkselection.h"
@@ -298,7 +299,7 @@ static const guchar dropper_bits[] = {
   "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
   "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"};
 
-G_DEFINE_TYPE (GtkColorSelection, gtk_color_selection, GTK_TYPE_VBOX)
+G_DEFINE_TYPE (GtkColorSelection, gtk_color_selection, GTK_TYPE_BOX)
 
 static void
 gtk_color_selection_class_init (GtkColorSelectionClass *klass)
@@ -394,6 +395,9 @@ gtk_color_selection_init (GtkColorSelection *colorsel)
   AtkObject *atk_obj;
   GList *focus_chain = NULL;
 
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (colorsel),
+                                  GTK_ORIENTATION_VERTICAL);
+
   gtk_widget_push_composite_child ();
 
   priv = colorsel->private_data = G_TYPE_INSTANCE_GET_PRIVATE (colorsel, GTK_TYPE_COLOR_SELECTION, GtkColorSelectionPrivate);
diff --git a/gtk/gtkcolorsel.h b/gtk/gtkcolorsel.h
index 7d5d85f8d0..0dbdae11f8 100644
--- a/gtk/gtkcolorsel.h
+++ b/gtk/gtkcolorsel.h
@@ -33,7 +33,7 @@
 #define __GTK_COLOR_SELECTION_H__
 
 #include <gtk/gtkdialog.h>
-#include <gtk/gtkvbox.h>
+#include <gtk/gtkbox.h>
 
 G_BEGIN_DECLS
 
@@ -66,7 +66,7 @@ typedef void (* GtkColorSelectionChangePaletteWithScreenFunc) (GdkScreen
 
 struct _GtkColorSelection
 {
-  GtkVBox parent_instance;
+  GtkBox parent_instance;
 
   /* < private_data > */
   GtkColorSelectionPrivate *private_data;
@@ -74,7 +74,7 @@ struct _GtkColorSelection
 
 struct _GtkColorSelectionClass
 {
-  GtkVBoxClass parent_class;
+  GtkBoxClass parent_class;
 
   void (*color_changed)	(GtkColorSelection *color_selection);