diff --git a/rpcs3/Emu/System.cpp b/rpcs3/Emu/System.cpp
index 42854504f7..92a1df7476 100644
--- a/rpcs3/Emu/System.cpp
+++ b/rpcs3/Emu/System.cpp
@@ -3152,7 +3152,11 @@ void Emulator::GracefulShutdown(bool allow_autoexit, bool async_op, bool savesta
 
 	if (async_op)
 	{
-		std::thread{perform_kill}.detach();
+		std::thread{[perform_kill]()
+		{
+			thread_base::set_name("Perform Kill");
+			perform_kill();
+		}}.detach();
 	}
 	else
 	{
diff --git a/rpcs3/rpcs3qt/downloader.cpp b/rpcs3/rpcs3qt/downloader.cpp
index 852449c0af..9a5038fcc1 100644
--- a/rpcs3/rpcs3qt/downloader.cpp
+++ b/rpcs3/rpcs3qt/downloader.cpp
@@ -8,6 +8,7 @@
 #include "progress_dialog.h"
 
 #include "util/logs.hpp"
+#include "Utilities/Thread.h"
 
 #include <thread>
 
@@ -82,6 +83,8 @@ void downloader::start(const std::string& url, bool follow_location, bool show_p
 
 	m_thread = QThread::create([this]
 	{
+		thread_base::set_name("Downloader");
+
 		// Reset error buffer before we call curl_easy_perform
 		m_curl->reset_error_buffer();
 
diff --git a/rpcs3/rpcs3qt/memory_viewer_panel.cpp b/rpcs3/rpcs3qt/memory_viewer_panel.cpp
index bcaa6537ef..0c779a9558 100644
--- a/rpcs3/rpcs3qt/memory_viewer_panel.cpp
+++ b/rpcs3/rpcs3qt/memory_viewer_panel.cpp
@@ -504,6 +504,8 @@ memory_viewer_panel::memory_viewer_panel(QWidget* parent, std::shared_ptr<CPUDis
 
 			m_search_thread = QThread::create([this, wstr, m_modes = m_modes]()
 			{
+				thread_base::set_name("MemViewerSearch");
+
 				gui_log.notice("Searching for %s (mode: %s)", wstr, m_modes);
 
 				u64 found = 0;
diff --git a/rpcs3/rpcs3qt/movie_item_base.cpp b/rpcs3/rpcs3qt/movie_item_base.cpp
index 669aec515d..cef8fa89c9 100644
--- a/rpcs3/rpcs3qt/movie_item_base.cpp
+++ b/rpcs3/rpcs3qt/movie_item_base.cpp
@@ -1,5 +1,6 @@
 #include "stdafx.h"
 #include "movie_item_base.h"
+#include "Utilities/Thread.h"
 
 movie_item_base::movie_item_base() : qt_video_source()
 {
@@ -33,6 +34,8 @@ void movie_item_base::call_icon_load_func(int index)
 	m_icon_loading = true;
 	m_icon_load_thread.reset(QThread::create([this, index]()
 	{
+		thread_base::set_name(fmt::format("IconLoad %d", index));
+
 		if (m_icon_load_callback)
 		{
 			m_icon_load_callback(index);
@@ -63,6 +66,8 @@ void movie_item_base::call_size_calc_func()
 	m_size_on_disk_loading = true;
 	m_size_calc_thread.reset(QThread::create([this]()
 	{
+		thread_base::set_name("SizeCalc");
+
 		if (m_size_calc_callback)
 		{
 			m_size_calc_callback();
diff --git a/rpcs3/rpcs3qt/ps_move_tracker_dialog.cpp b/rpcs3/rpcs3qt/ps_move_tracker_dialog.cpp
index f00d66245a..218ccfc809 100644
--- a/rpcs3/rpcs3qt/ps_move_tracker_dialog.cpp
+++ b/rpcs3/rpcs3qt/ps_move_tracker_dialog.cpp
@@ -405,6 +405,8 @@ void ps_move_tracker_dialog::reset_camera()
 
 	m_tracker_thread.reset(QThread::create([this]()
 	{
+		thread_base::set_name("PS Move Tracker");
+
 		while (!m_stop_threads)
 		{
 			process_camera_frame();
diff --git a/rpcs3/rpcs3qt/screenshot_item.cpp b/rpcs3/rpcs3qt/screenshot_item.cpp
index dbfd96d44d..2d24c7cb36 100644
--- a/rpcs3/rpcs3qt/screenshot_item.cpp
+++ b/rpcs3/rpcs3qt/screenshot_item.cpp
@@ -1,5 +1,6 @@
 #include "screenshot_item.h"
 #include "qt_utils.h"
+#include "Utilities/Thread.h"
 
 #include <QVBoxLayout>
 
@@ -10,6 +11,8 @@ screenshot_item::screenshot_item(QWidget* parent)
 	{
 		m_thread.reset(QThread::create([this]()
 		{
+			thread_base::set_name("Screenshot item");
+
 			const QPixmap pixmap = gui::utils::get_aligned_pixmap(icon_path, icon_size, 1.0, Qt::SmoothTransformation, gui::utils::align_h::center, gui::utils::align_v::center);
 			Q_EMIT signal_icon_update(pixmap);
 		}));
diff --git a/rpcs3/rpcs3qt/update_manager.cpp b/rpcs3/rpcs3qt/update_manager.cpp
index d32a1810b9..a34292ce0e 100644
--- a/rpcs3/rpcs3qt/update_manager.cpp
+++ b/rpcs3/rpcs3qt/update_manager.cpp
@@ -19,7 +19,6 @@
 #include <QJsonArray>
 #include <QJsonObject>
 #include <QJsonDocument>
-#include <QThread>
 
 #if defined(_WIN32) || defined(__APPLE__)
 #include <7z.h>