diff --git a/gui/instancesettings.cpp b/gui/instancesettings.cpp
index 8a973665..dfb04f3d 100644
--- a/gui/instancesettings.cpp
+++ b/gui/instancesettings.cpp
@@ -34,6 +34,12 @@ InstanceSettings::~InstanceSettings()
 	delete ui;
 }
 
+void InstanceSettings::showEvent ( QShowEvent* ev )
+{
+	QDialog::showEvent(ev);
+	adjustSize();
+}
+
 void InstanceSettings::on_customCommandsGroupBox_toggled(bool state)
 {
 	ui->labelCustomCmdsDescription->setEnabled(state);
diff --git a/gui/instancesettings.h b/gui/instancesettings.h
index afbd0c16..b6cdb92c 100644
--- a/gui/instancesettings.h
+++ b/gui/instancesettings.h
@@ -20,7 +20,8 @@ public:
 
 	void applySettings();
 	void loadSettings();
-    
+protected:
+	virtual void showEvent ( QShowEvent* );
 private slots:
 	void on_customCommandsGroupBox_toggled(bool arg1);
 	void on_buttonBox_accepted();
diff --git a/gui/settingsdialog.cpp b/gui/settingsdialog.cpp
index f3aa7316..909706b6 100644
--- a/gui/settingsdialog.cpp
+++ b/gui/settingsdialog.cpp
@@ -35,6 +35,11 @@ SettingsDialog::~SettingsDialog()
 {
 	delete ui;
 }
+void SettingsDialog::showEvent ( QShowEvent* ev )
+{
+	QDialog::showEvent(ev);
+	adjustSize();
+}
 
 void SettingsDialog::updateCheckboxStuff()
 {
diff --git a/gui/settingsdialog.h b/gui/settingsdialog.h
index 815aa11d..b0a8c673 100644
--- a/gui/settingsdialog.h
+++ b/gui/settingsdialog.h
@@ -36,6 +36,9 @@ public:
 	
 	void applySettings(SettingsObject *s);
 	void loadSettings(SettingsObject* s);
+
+protected:
+	virtual void showEvent ( QShowEvent* );
 	
 private slots:
 	void on_instDirBrowseBtn_clicked();