diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c
index a022ed33c0..1f3c6e2fcb 100644
--- a/gtk/gtkfontsel.c
+++ b/gtk/gtkfontsel.c
@@ -51,11 +51,11 @@
 #include "gtktable.h"
 #include "gtktreeselection.h"
 #include "gtktreeview.h"
-#include "gtkvbox.h"
 #include "gtkscrolledwindow.h"
 #include "gtkintl.h"
 #include "gtkaccessible.h"
 #include "gtkbuildable.h"
+#include "gtkorientable.h"
 #include "gtkprivate.h"
 
 
@@ -220,7 +220,7 @@ static void     gtk_font_selection_ref_family            (GtkFontSelection *font
 static void     gtk_font_selection_ref_face              (GtkFontSelection *fontsel,
 							  PangoFontFace    *face);
 
-G_DEFINE_TYPE (GtkFontSelection, gtk_font_selection, GTK_TYPE_VBOX)
+G_DEFINE_TYPE (GtkFontSelection, gtk_font_selection, GTK_TYPE_BOX)
 
 static void
 gtk_font_selection_class_init (GtkFontSelectionClass *klass)
@@ -345,6 +345,9 @@ gtk_font_selection_init (GtkFontSelection *fontsel)
                                                GtkFontSelectionPrivate);
   priv = fontsel->priv;
 
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (fontsel),
+                                  GTK_ORIENTATION_VERTICAL);
+
   gtk_widget_push_composite_child ();
 
   gtk_box_set_spacing (GTK_BOX (fontsel), 12);
diff --git a/gtk/gtkfontsel.h b/gtk/gtkfontsel.h
index e481b6f81b..1bf2907847 100644
--- a/gtk/gtkfontsel.h
+++ b/gtk/gtkfontsel.h
@@ -37,7 +37,7 @@
 
 
 #include <gtk/gtkdialog.h>
-#include <gtk/gtkvbox.h>
+#include <gtk/gtkbox.h>
 
 
 G_BEGIN_DECLS
@@ -68,7 +68,7 @@ typedef struct _GtkFontSelectionDialogClass         GtkFontSelectionDialogClass;
 
 struct _GtkFontSelection
 {
-  GtkVBox parent_instance;
+  GtkBox parent_instance;
 
   /*< private >*/
   GtkFontSelectionPrivate *priv;
@@ -76,7 +76,7 @@ struct _GtkFontSelection
 
 struct _GtkFontSelectionClass
 {
-  GtkVBoxClass parent_class;
+  GtkBoxClass parent_class;
 
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);