diff --git a/src/exportdialog.cpp b/src/exportdialog.cpp
index a95c030e..5040c9f0 100644
--- a/src/exportdialog.cpp
+++ b/src/exportdialog.cpp
@@ -91,6 +91,7 @@ ExportDialog::ExportDialog(QPrinter *printer, QWidget *parent)
 	line->setFrameShadow(QFrame::Sunken);
 	pageSetupLayout->addRow(line);
 	pageSetupLayout->addRow(tr("File:"), _fileSelect);
+	pageSetupLayout->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow);
 #else // Q_OS_MAC
 	pageSetupBox->setLayout(pageSetupLayout);
 #endif // Q_OS_MAC
diff --git a/src/fileselectwidget.cpp b/src/fileselectwidget.cpp
index 7cc6c69b..b9230f6b 100644
--- a/src/fileselectwidget.cpp
+++ b/src/fileselectwidget.cpp
@@ -1,3 +1,4 @@
+#include <QPushButton>
 #include <QToolButton>
 #include <QFileDialog>
 #include <QHBoxLayout>
@@ -12,8 +13,13 @@ FileSelectWidget::FileSelectWidget(QWidget *parent) : QWidget(parent)
 	QFontMetrics fm(QApplication::font());
 	_edit = new QLineEdit();
 	_edit->setMinimumWidth(fm.boundingRect(QDir::homePath()).width());
+#ifdef Q_OS_WIN32
+	_button = new QPushButton("...");
+	_button->setMaximumWidth(_button->sizeHint().width() / 2);
+#else // Q_OS_WIN32
 	_button = new QToolButton();
 	_button->setText("...");
+#endif // Q_OS_WIN32
 	connect(_button, SIGNAL(clicked()), this, SLOT(browse()));
 
 	QHBoxLayout *layout = new QHBoxLayout();
@@ -21,6 +27,9 @@ FileSelectWidget::FileSelectWidget(QWidget *parent) : QWidget(parent)
 	layout->addWidget(_edit);
 	layout->addWidget(_button);
 	setLayout(layout);
+
+	QSizePolicy p(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
+	setSizePolicy(p);
 }
 
 void FileSelectWidget::browse()
diff --git a/src/fileselectwidget.h b/src/fileselectwidget.h
index 25111a10..ce68b0b2 100644
--- a/src/fileselectwidget.h
+++ b/src/fileselectwidget.h
@@ -4,6 +4,7 @@
 #include <QWidget>
 #include <QLineEdit>
 
+class QPushButton;
 class QToolButton;
 
 class FileSelectWidget : public QWidget
@@ -22,7 +23,11 @@ private slots:
 
 private:
 	QLineEdit *_edit;
+#ifdef Q_OS_WIN32
+	QPushButton *_button;
+#else // Q_OS_WIN32
 	QToolButton *_button;
+#endif // Q_OS_WIN32
 
 	QString _filter;
 };