diff --git a/src/frontend/KaizenGui.cpp b/src/frontend/KaizenGui.cpp
index cf08195..10833e2 100644
--- a/src/frontend/KaizenGui.cpp
+++ b/src/frontend/KaizenGui.cpp
@@ -189,6 +189,8 @@ void KaizenGui::cleanup() {
     SDL_Quit();
     core.Stop();
     emuThread->requestInterruption();
+    while (emuThread->isRunning())
+        ;
     emuThread->quit();
     delete emuThread;
     delete vulkanWidget;
diff --git a/src/frontend/Settings/AudioSettings.cpp b/src/frontend/Settings/AudioSettings.cpp
index 557593b..51b38ce 100644
--- a/src/frontend/Settings/AudioSettings.cpp
+++ b/src/frontend/Settings/AudioSettings.cpp
@@ -18,5 +18,6 @@ AudioSettings::AudioSettings() : settings(QSettings::UserScope) {
     v = new QVBoxLayout();
     v->addWidget(volume);
     v->addWidget(volumePercent);
+    v->addStretch(-1);
     setLayout(v);
 }
diff --git a/src/frontend/Settings/CPUSettings.cpp b/src/frontend/Settings/CPUSettings.cpp
index a93577d..a356454 100644
--- a/src/frontend/Settings/CPUSettings.cpp
+++ b/src/frontend/Settings/CPUSettings.cpp
@@ -51,5 +51,6 @@ CPUSettings::CPUSettings() : settings(QSettings::UserScope) {
     h->addWidget(idleSkip);
     v->addWidget(types);
     v->addLayout(h);
+    v->addStretch(-1);
     setLayout(v);
 }
diff --git a/src/frontend/Settings/GeneralSettings.cpp b/src/frontend/Settings/GeneralSettings.cpp
index 8267ce7..da96395 100644
--- a/src/frontend/Settings/GeneralSettings.cpp
+++ b/src/frontend/Settings/GeneralSettings.cpp
@@ -43,8 +43,6 @@ GeneralSettings::GeneralSettings() : settings(QSettings::UserScope) {
         emit romFolderSelected();
     });
 
-    gl = new QGridLayout();
-
     QPushButton *clearRoms = new QPushButton("Clear");
     connect(clearRoms, &QPushButton::clicked, this, [&] {
         selectedRomsFolderLabel->clear();
@@ -62,6 +60,8 @@ GeneralSettings::GeneralSettings() : settings(QSettings::UserScope) {
         settings.sync();
     });
 
+    gl = new QGridLayout();
+
     gl->addWidget(new QLabel("ROMs path:"), 0, 0);
     gl->addWidget(selectedRomsFolderLabel, 0, 1);
     gl->addWidget(romsFolderSelectButton, 0, 2);
@@ -71,6 +71,7 @@ GeneralSettings::GeneralSettings() : settings(QSettings::UserScope) {
     gl->addWidget(selectedSavesFolderLabel, 1, 1);
     gl->addWidget(savesFolderSelectButton, 1, 2);
     gl->addWidget(clearSaves, 1, 3);
+    gl->addItem(new QSpacerItem(1, 1, QSizePolicy::Expanding, QSizePolicy::Expanding), 2, 0, 2, -1);
 
     setLayout(gl);
 }