@Override
    protected LayoutManager createLayoutManager() {
        final LayoutManager layout = super.createLayoutManager();
        return new ComboBoxLayoutManager() {
            @Override
            public void layoutContainer(Container parent) {
                layout.layoutContainer(parent);
                if (arrowButton != null && comboBox.isEditable()
                        && comboBox.getBorder() instanceof AeroEditorBorder) {
                    // Tune the bounds of the arrow button to fit the border.
                    Insets insets = getInsets();
                    Rectangle bounds = arrowButton.getBounds();
                    arrowButton.setBounds(bounds.x + insets.right, 0, bounds.width,
                            bounds.height + insets.top + insets.bottom);
                }
            }
        };
    }