diff --git a/mainwindow.cpp b/mainwindow.cpp
index b81ab17c4..1f4094bce 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -219,36 +219,7 @@ MainWindow::MainWindow(QWidget *parent) :
 }
 
 MainWindow::~MainWindow() {
-	panel_effect_controls->clear_effects(true);
-	panel_sequence_viewer->viewer_widget->delete_function();
-	panel_footage_viewer->viewer_widget->delete_function();
-
-	set_sequence(NULL);
-
-	QString data_dir = get_data_path();
-	if (!data_dir.isEmpty() && !autorecovery_filename.isEmpty()) {
-		if (QFile::exists(autorecovery_filename)) {
-			QFile::rename(autorecovery_filename, autorecovery_filename + "." + QDateTime::currentDateTimeUtc().toString("yyyyMMddHHmmss"));
-		}
-	}
-	if (!config_dir.isEmpty()) {
-		// save settings
-		config.save(config_dir);
-
-		// save panel layout
-		QFile panel_config(data_dir + "/layout");
-		if (panel_config.open(QFile::WriteOnly)) {
-			panel_config.write(saveState(0));
-			panel_config.close();
-		} else {
-			dout << "[ERROR] Failed to save layout";
-		}
-	}
-
-	stop_audio();
-
 	free_panels();
-
 	close_debug();
 }
 
@@ -790,6 +761,34 @@ void MainWindow::updateTitle(const QString& url) {
 
 void MainWindow::closeEvent(QCloseEvent *e) {
 	if (can_close_project()) {
+		panel_effect_controls->clear_effects(true);
+		panel_sequence_viewer->viewer_widget->delete_function();
+		panel_footage_viewer->viewer_widget->delete_function();
+
+		set_sequence(NULL);
+
+		QString data_dir = get_data_path();
+		if (!data_dir.isEmpty() && !autorecovery_filename.isEmpty()) {
+			if (QFile::exists(autorecovery_filename)) {
+				QFile::rename(autorecovery_filename, autorecovery_filename + "." + QDateTime::currentDateTimeUtc().toString("yyyyMMddHHmmss"));
+			}
+		}
+		if (!config_dir.isEmpty()) {
+			// save settings
+			config.save(config_dir);
+
+			// save panel layout
+			QFile panel_config(data_dir + "/layout");
+			if (panel_config.open(QFile::WriteOnly)) {
+				panel_config.write(saveState(0));
+				panel_config.close();
+			} else {
+				dout << "[ERROR] Failed to save layout";
+			}
+		}
+
+		stop_audio();
+
 		e->accept();
 	} else {
 		e->ignore();
diff --git a/panels/effectcontrols.cpp b/panels/effectcontrols.cpp
index a163ed549..de1726900 100644
--- a/panels/effectcontrols.cpp
+++ b/panels/effectcontrols.cpp
@@ -37,6 +37,8 @@ EffectControls::EffectControls(QWidget *parent) :
 	panel_name("Effects: "),
 	mode(TA_NO_TRANSITION)
 {
+	setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+
 	setup_ui();
 
 	init_effects();
@@ -253,8 +255,6 @@ void EffectControls::open_effect(QVBoxLayout* layout, Effect* e) {
 }
 
 void EffectControls::setup_ui() {
-	setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
-
 	QWidget* contents = new QWidget();
 
 	QHBoxLayout* layout = new QHBoxLayout(contents);
diff --git a/panels/grapheditor.cpp b/panels/grapheditor.cpp
index 71dd5142f..bc8bc48dc 100644
--- a/panels/grapheditor.cpp
+++ b/panels/grapheditor.cpp
@@ -18,18 +18,20 @@
 #include "debug.h"
 
 GraphEditor::GraphEditor(QWidget* parent) : QDockWidget(parent), row(NULL) {
-    setWindowTitle("Graph Editor");
-    resize(720, 480);
+	setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+
+	setWindowTitle("Graph Editor");
+	resize(720, 480);
 
 	QWidget* main_widget = new QWidget();
 	setWidget(main_widget);
-    QVBoxLayout* layout = new QVBoxLayout();
+	QVBoxLayout* layout = new QVBoxLayout();
 	main_widget->setLayout(layout);
 
-    QWidget* tool_widget = new QWidget();
-    tool_widget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum);
-    QHBoxLayout* tools = new QHBoxLayout();
-    tool_widget->setLayout(tools);
+	QWidget* tool_widget = new QWidget();
+	tool_widget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum);
+	QHBoxLayout* tools = new QHBoxLayout();
+	tool_widget->setLayout(tools);
 
 	QWidget* left_tool_widget = new QWidget();
 	QHBoxLayout* left_tool_layout = new QHBoxLayout();
@@ -89,7 +91,7 @@ GraphEditor::GraphEditor(QWidget* parent) : QDockWidget(parent), row(NULL) {
 		right_tool_layout->addWidget(tool_buttons.at(i));
 	}*/
 
-    layout->addWidget(tool_widget);
+	layout->addWidget(tool_widget);
 
 	QWidget* central_widget = new QWidget();
 	QVBoxLayout* central_layout = new QVBoxLayout();
@@ -104,11 +106,11 @@ GraphEditor::GraphEditor(QWidget* parent) : QDockWidget(parent), row(NULL) {
 
 	layout->addWidget(central_widget);
 
-    QWidget* value_widget = new QWidget();
-    value_widget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum);
+	QWidget* value_widget = new QWidget();
+	value_widget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum);
 	QHBoxLayout* values = new QHBoxLayout();
-    value_widget->setLayout(values);
-    values->addStretch();
+	value_widget->setLayout(values);
+	values->addStretch();
 
 	current_row_desc = new QLabel();
 	values->addWidget(current_row_desc);
@@ -119,7 +121,7 @@ GraphEditor::GraphEditor(QWidget* parent) : QDockWidget(parent), row(NULL) {
 	central_value_widget->setLayout(value_layout);
 	values->addWidget(central_value_widget);
 
-    values->addStretch();
+	values->addStretch();
 	layout->addWidget(value_widget);
 
 	connect(view, SIGNAL(zoom_changed(double)), header, SLOT(update_zoom(double)));
diff --git a/panels/project.cpp b/panels/project.cpp
index 31669a555..563f38c9b 100644
--- a/panels/project.cpp
+++ b/panels/project.cpp
@@ -60,7 +60,7 @@ QString recent_proj_file;
 Project::Project(QWidget *parent) :
 	QDockWidget(parent)
 {
-	setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
+	setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
 
 	QWidget* dockWidgetContents = new QWidget();
 	QVBoxLayout* verticalLayout = new QVBoxLayout(dockWidgetContents);
diff --git a/panels/timeline.cpp b/panels/timeline.cpp
index 432fb6996..0e97fb22a 100644
--- a/panels/timeline.cpp
+++ b/panels/timeline.cpp
@@ -80,6 +80,8 @@ Timeline::Timeline(QWidget *parent) :
 	last_frame(0),
 	scroll(0)
 {
+	setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+
 	setup_ui();
 
 	default_track_height = (QGuiApplication::primaryScreen()->logicalDotsPerInch() / 96) * TRACK_DEFAULT_HEIGHT;
diff --git a/panels/viewer.cpp b/panels/viewer.cpp
index 01e488079..d09f53ae7 100644
--- a/panels/viewer.cpp
+++ b/panels/viewer.cpp
@@ -46,6 +46,8 @@ Viewer::Viewer(QWidget *parent) :
 	panel_name("Viewer: "),
 	minimum_zoom(1.0)
 {
+	setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+
 	setup_ui();
 
 	headers->viewer = this;
@@ -449,8 +451,6 @@ void Viewer::set_sb_max() {
 }
 
 void Viewer::setup_ui() {
-	setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
-
 	QWidget* contents = new QWidget();
 
 	QVBoxLayout* layout = new QVBoxLayout(contents);