diff --git a/clapper_src/buttons.js b/clapper_src/buttons.js
index 9064fad4..92fcaf08 100644
--- a/clapper_src/buttons.js
+++ b/clapper_src/buttons.js
@@ -76,7 +76,9 @@ class BoxedPopoverButton extends BoxedIconButton
         this.popover = new Gtk.Popover({
             relative_to: this.box
         });
-        this.popoverBox = new Gtk.VBox();
+        this.popoverBox = new Gtk.Box({
+            orientation: Gtk.Orientation.VERTICAL
+        });
         this.popover.add(this.popoverBox);
         this.popoverBox.show();
         this.connect(
diff --git a/clapper_src/controls.js b/clapper_src/controls.js
index 7bc85b9d..2c60e6e0 100644
--- a/clapper_src/controls.js
+++ b/clapper_src/controls.js
@@ -19,11 +19,12 @@ var Controls = GObject.registerClass({
             param_types: [GObject.TYPE_STRING]
         },
     }
-}, class ClapperControls extends Gtk.HBox
+}, class ClapperControls extends Gtk.Box
 {
     _init()
     {
         super._init({
+            orientation: Gtk.Orientation.HORIZONTAL,
             margin_start: CONTROLS_MARGIN,
             margin_end: CONTROLS_MARGIN,
             spacing: CONTROLS_SPACING,