diff --git a/Source/Core/DolphinQt2/Config/FilesystemWidget.cpp b/Source/Core/DolphinQt2/Config/FilesystemWidget.cpp
index 4f8cb4e631..3b0ccea37f 100644
--- a/Source/Core/DolphinQt2/Config/FilesystemWidget.cpp
+++ b/Source/Core/DolphinQt2/Config/FilesystemWidget.cpp
@@ -153,9 +153,9 @@ void FilesystemWidget::PopulateDirectory(int partition_id, QStandardItem* root,
   }
 }
 
-static QString SelectFolder()
+QString FilesystemWidget::SelectFolder()
 {
-  return QFileDialog::getExistingDirectory(nullptr, QObject::tr("Choose the folder to extract to"));
+  return QFileDialog::getExistingDirectory(this, QObject::tr("Choose the folder to extract to"));
 }
 
 void FilesystemWidget::ShowContextMenu(const QPoint&)
@@ -197,9 +197,9 @@ void FilesystemWidget::ShowContextMenu(const QPoint&)
         return;
 
       if (ExtractSystemData(partition, folder))
-        QMessageBox::information(nullptr, tr("Success"), tr("Successfully extracted system data."));
+        QMessageBox::information(this, tr("Success"), tr("Successfully extracted system data."));
       else
-        QMessageBox::critical(nullptr, tr("Error"), tr("Failed to extract system data."));
+        QMessageBox::critical(this, tr("Error"), tr("Failed to extract system data."));
     });
   }
 
@@ -291,6 +291,7 @@ void FilesystemWidget::ExtractDirectory(const DiscIO::Partition& partition, cons
   dialog->setMinimum(0);
   dialog->setMaximum(size);
   dialog->show();
+  dialog->setWindowTitle(tr("Progress"));
 
   bool all = path.isEmpty();
 
@@ -320,9 +321,9 @@ void FilesystemWidget::ExtractFile(const DiscIO::Partition& partition, const QSt
       *m_volume, partition, filesystem->FindFileInfo(path.toStdString()).get(), out.toStdString());
 
   if (success)
-    QMessageBox::information(nullptr, tr("Success"), tr("Successfully extracted file."));
+    QMessageBox::information(this, tr("Success"), tr("Successfully extracted file."));
   else
-    QMessageBox::critical(nullptr, tr("Error"), tr("Failed to extract file."));
+    QMessageBox::critical(this, tr("Error"), tr("Failed to extract file."));
 }
 
 void FilesystemWidget::CheckIntegrity(const DiscIO::Partition& partition)
@@ -345,10 +346,10 @@ void FilesystemWidget::CheckIntegrity(const DiscIO::Partition& partition)
   dialog->close();
 
   if (is_valid.get())
-    QMessageBox::information(nullptr, tr("Success"),
+    QMessageBox::information(this, tr("Success"),
                              tr("Integrity check completed. No errors have been found."));
   else
-    QMessageBox::critical(nullptr, tr("Error"),
+    QMessageBox::critical(this, tr("Error"),
                           tr("Integrity check for partition failed. The disc image is most "
                              "likely corrupted or has been patched incorrectly."));
 }
diff --git a/Source/Core/DolphinQt2/Config/FilesystemWidget.h b/Source/Core/DolphinQt2/Config/FilesystemWidget.h
index ba1a16db36..47e7342a4b 100644
--- a/Source/Core/DolphinQt2/Config/FilesystemWidget.h
+++ b/Source/Core/DolphinQt2/Config/FilesystemWidget.h
@@ -35,6 +35,8 @@ private:
   void PopulateDirectory(int partition_id, QStandardItem* root, const DiscIO::Partition& partition);
   void PopulateDirectory(int partition_id, QStandardItem* root, const DiscIO::FileInfo& directory);
 
+  QString SelectFolder();
+
   void ShowContextMenu(const QPoint&);
 
   void ExtractPartition(const DiscIO::Partition& partition, const QString& out);
diff --git a/Source/Core/DolphinQt2/GameList/GameList.cpp b/Source/Core/DolphinQt2/GameList/GameList.cpp
index 6bcbfb88b9..0ef6cc929f 100644
--- a/Source/Core/DolphinQt2/GameList/GameList.cpp
+++ b/Source/Core/DolphinQt2/GameList/GameList.cpp
@@ -475,6 +475,9 @@ void GameList::CompressISO(bool decompress)
     QProgressDialog progress_dialog(decompress ? tr("Decompressing...") : tr("Compressing..."),
                                     tr("Abort"), 0, 100, this);
     progress_dialog.setWindowModality(Qt::WindowModal);
+    progress_dialog.setWindowFlags(progress_dialog.windowFlags() &
+                                   ~Qt::WindowContextHelpButtonHint);
+    progress_dialog.setWindowTitle(tr("Progress"));
 
     bool good;