diff --git a/rpcs3/Emu/RSX/GL/GLOverlays.cpp b/rpcs3/Emu/RSX/GL/GLOverlays.cpp
index 172f002a19..22d2f26d66 100644
--- a/rpcs3/Emu/RSX/GL/GLOverlays.cpp
+++ b/rpcs3/Emu/RSX/GL/GLOverlays.cpp
@@ -433,10 +433,8 @@ namespace gl
 		{
 			return cached->second.get();
 		}
-		else
-		{
-			return load_simple_image(desc, true, owner_uid);
-		}
+
+		return load_simple_image(desc, true, owner_uid);
 	}
 
 	void ui_overlay_renderer::set_primitive_type(rsx::overlays::primitive_type type)
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_controls.cpp b/rpcs3/Emu/RSX/Overlays/overlay_controls.cpp
index b3ecc6b639..39bdd2d3e1 100644
--- a/rpcs3/Emu/RSX/Overlays/overlay_controls.cpp
+++ b/rpcs3/Emu/RSX/Overlays/overlay_controls.cpp
@@ -35,13 +35,13 @@ namespace rsx
 				return;
 			}
 
-			auto bytes = f.to_vector<u8>();
-			data = stbi_load_from_memory(bytes.data(), ::narrow<int>(f.size()), &w, &h, &bpp, STBI_rgb_alpha);
+			const std::vector<u8> bytes = f.to_vector<u8>();
+			load_data(bytes);
 		}
 
 		image_info::image_info(const std::vector<u8>& bytes)
 		{
-			data = stbi_load_from_memory(bytes.data(), ::narrow<int>(bytes.size()), &w, &h, &bpp, STBI_rgb_alpha);
+			load_data(bytes);
 		}
 
 		image_info::~image_info()
@@ -49,6 +49,11 @@ namespace rsx
 			if (data) stbi_image_free(data);
 		}
 
+		void image_info::load_data(const std::vector<u8>& bytes)
+		{
+			data = stbi_load_from_memory(bytes.data(), ::narrow<int>(bytes.size()), &w, &h, &bpp, STBI_rgb_alpha);
+		}
+
 		resource_config::resource_config()
 		{
 			texture_resource_files.emplace_back("fade_top.png");
@@ -650,12 +655,10 @@ namespace rsx
 				m_items.push_back(std::move(item));
 				return m_items.back().get();
 			}
-			else
-			{
-				auto result = item.get();
-				m_items.insert(m_items.begin() + offset, std::move(item));
-				return result;
-			}
+
+			auto result = item.get();
+			m_items.insert(m_items.begin() + offset, std::move(item));
+			return result;
 		}
 
 		compiled_resource& vertical_layout::get_compiled()
@@ -670,6 +673,12 @@ namespace rsx
 
 				for (auto &item : m_items)
 				{
+					if (!item)
+					{
+						rsx_log.error("Found null item in overlay_controls");
+						continue;
+					}
+
 					const s32 item_y_limit = s32{item->y} + item->h - scroll_offset_value - y;
 					const s32 item_y_base = s32{item->y} - scroll_offset_value - y;
 
@@ -678,7 +687,8 @@ namespace rsx
 						// Out of bounds
 						continue;
 					}
-					else if (item_y_limit > h || item_y_base < 0)
+
+					if (item_y_limit > h || item_y_base < 0)
 					{
 						// Partial render
 						areaf clip_rect = static_cast<areaf>(areai{x, y, (x + w), (y + h)});
@@ -721,12 +731,10 @@ namespace rsx
 				m_items.push_back(std::move(item));
 				return m_items.back().get();
 			}
-			else
-			{
-				auto result = item.get();
-				m_items.insert(m_items.begin() + offset, std::move(item));
-				return result;
-			}
+
+			auto result = item.get();
+			m_items.insert(m_items.begin() + offset, std::move(item));
+			return result;
 		}
 
 		compiled_resource& horizontal_layout::get_compiled()
@@ -783,7 +791,6 @@ namespace rsx
 				cmd_img.config.set_image_resource(image_resource_ref);
 				cmd_img.config.color = fore_color;
 				cmd_img.config.external_data_ref = external_ref;
-
 				cmd_img.config.blur_strength = blur_strength;
 
 				// Make padding work for images (treat them as the content instead of the 'background')
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_controls.h b/rpcs3/Emu/RSX/Overlays/overlay_controls.h
index f348b3d52c..805e72224c 100644
--- a/rpcs3/Emu/RSX/Overlays/overlay_controls.h
+++ b/rpcs3/Emu/RSX/Overlays/overlay_controls.h
@@ -40,6 +40,8 @@ namespace rsx
 			image_info(const char* filename);
 			image_info(const std::vector<u8>& bytes);
 			~image_info();
+
+			void load_data(const std::vector<u8>& bytes);
 		};
 
 		struct resource_config
@@ -87,8 +89,8 @@ namespace rsx
 				bool clip_region = false;
 
 				u8 texture_ref = image_resource_id::none;
-				font *font_ref = nullptr;
-				void *external_data_ref = nullptr;
+				font* font_ref = nullptr;
+				void* external_data_ref = nullptr;
 
 				u8 blur_strength = 0;
 
@@ -243,7 +245,7 @@ namespace rsx
 		{
 		private:
 			u8 image_resource_ref = image_resource_id::none;
-			void *external_ref = nullptr;
+			void* external_ref = nullptr;
 
 			// Strength of blur effect
 			u8 blur_strength = 0;
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_media_list_dialog.cpp b/rpcs3/Emu/RSX/Overlays/overlay_media_list_dialog.cpp
index 09424a455f..675f560327 100644
--- a/rpcs3/Emu/RSX/Overlays/overlay_media_list_dialog.cpp
+++ b/rpcs3/Emu/RSX/Overlays/overlay_media_list_dialog.cpp
@@ -131,17 +131,12 @@ namespace rsx
 			m_dim_background->set_size(1280, 720);
 			m_dim_background->back_color.a = 0.5f;
 
-			m_list = std::make_unique<list_view>(1240, 540);
-			m_list->set_pos(20, 85);
-
 			m_description = std::make_unique<label>();
 			m_description->set_font("Arial", 20);
 			m_description->set_pos(20, 37);
 			m_description->set_text("Select media"); // Fallback. I don't think this will ever be used, so I won't localize it.
 			m_description->auto_resize();
 			m_description->back_color.a	= 0.f;
-
-			return_code = selection_code::canceled;
 		}
 
 		void media_list_dialog::on_button_pressed(pad_button button_press)
@@ -152,11 +147,11 @@ namespace rsx
 				if (m_no_media_text)
 					break;
 				return_code = m_list->get_selected_index();
-				close(false, true);
+				m_stop_input_loop = true;
 				break;
 			case pad_button::circle:
 				return_code = selection_code::canceled;
-				close(false, true);
+				m_stop_input_loop = true;
 				break;
 			case pad_button::dpad_up:
 				m_list->select_previous();
@@ -194,11 +189,12 @@ namespace rsx
 			return result;
 		}
 
-		s32 media_list_dialog::show(const media_entry& dir_entry, const std::string& title, u32 focused, bool enable_overlay)
+		s32 media_list_dialog::show(media_entry* root, media_entry& result, const std::string& title, u32 focused, bool enable_overlay)
 		{
-			rsx_log.warning("Media dialog: showing entry '%s' ('%s')", dir_entry.name, dir_entry.path);
+			auto ref = g_fxo->get<display_manager>().get(uid);
 
-			visible = false;
+			m_media = root;
+			result = {};
 
 			if (enable_overlay)
 			{
@@ -209,7 +205,69 @@ namespace rsx
 				m_dim_background->back_color.a = 0.5f;
 			}
 
-			for (const media_entry& child : dir_entry.children)
+			while (thread_ctrl::state() != thread_state::aborting && return_code >= 0 && m_media && m_media->type == media_list_dialog::media_type::directory)
+			{
+				reload(title, focused);
+				m_stop_input_loop = false;
+
+				if (const auto error = run_input_loop())
+				{
+					if (error != selection_code::canceled)
+					{
+						rsx_log.error("Media list dialog input loop exited with error code=%d", error);
+					}
+					return error;
+				}
+
+				if (return_code >= 0)
+				{
+					focused = 0;
+					ensure(static_cast<size_t>(return_code) < m_media->children.size());
+					m_media = &m_media->children[return_code];
+					rsx_log.notice("Media dialog: selected entry: %d ('%s')", return_code, m_media->path);
+					continue;
+				}
+
+				if (return_code == user_interface::selection_code::canceled)
+				{
+					if (m_media == root)
+					{
+						rsx_log.notice("Media list dialog canceled");
+						break;
+					}
+
+					focused = m_media->index;
+					m_media = m_media->parent;
+					return_code = 0;
+					rsx_log.notice("Media list dialog moving to parent directory (focused=%d)", focused);
+					continue;
+				}
+
+				rsx_log.error("Left media list dialog with error: %d", return_code);
+				break;
+			}
+
+			close(false, true);
+
+			if (return_code >= 0 && m_media && m_media->type != media_list_dialog::media_type::directory)
+			{
+				result = *m_media;
+				rsx_log.error("Left media list dialog: return_code=%d, type=%d, path=%d", return_code, static_cast<s32>(result.type), result.info.path);
+			}
+
+			return return_code;
+		}
+
+		void media_list_dialog::reload(const std::string& title, u32 focused)
+		{
+			ensure(m_media);
+
+			rsx_log.notice("Media dialog: showing entry '%s' ('%s')", m_media->name, m_media->path);
+
+			m_list = std::make_unique<list_view>(1240, 540);
+			m_list->set_pos(20, 85);
+
+			for (const media_entry& child : m_media->children)
 			{
 				std::unique_ptr<overlay_element> entry = std::make_unique<media_list_entry>(child);
 				m_list->add_entry(entry);
@@ -236,29 +294,6 @@ namespace rsx
 			m_description->auto_resize();
 
 			visible = true;
-
-			auto ref = g_fxo->get<display_manager>().get(uid);
-
-			if (const auto error = run_input_loop())
-			{
-				if (error != selection_code::canceled)
-				{
-					rsx_log.error("Media list dialog input loop exited with error code=%d", error);
-				}
-				return error;
-			}
-
-			if (return_code < 0)
-			{
-				rsx_log.notice("Media dialog canceled");
-			}
-			else
-			{
-				ensure(static_cast<size_t>(return_code) < dir_entry.children.size());
-				rsx_log.success("Media dialog: selected entry: %d ('%s')", return_code, dir_entry.children[return_code].path);
-			}
-
-			return return_code;
 		}
 
 		struct media_list_dialog_thread
@@ -326,7 +361,7 @@ namespace rsx
 				current_entry.path = media_path;
 				current_entry.name = name;
 			}
-		};
+		}
 
 		error_code show_media_list_dialog(media_list_dialog::media_type type, const std::string& path, const std::string& title, std::function<void(s32 status, utils::media_info info)> on_finished)
 		{
@@ -351,53 +386,23 @@ namespace rsx
 					rsx_log.error("Media list: Failed to open path: '%s'", path);
 				}
 
-				media_list_dialog::media_entry* media = &root_media_entry;
+				media_list_dialog::media_entry media{};
 				s32 result = 0;
 				u32 focused = 0;
 
-				while (thread_ctrl::state() != thread_state::aborting && result >= 0 && media && media->type == media_list_dialog::media_type::directory)
+				if (auto manager = g_fxo->try_get<rsx::overlays::display_manager>())
+				{
+					result = manager->create<rsx::overlays::media_list_dialog>()->show(&root_media_entry, media, title, focused, true);
+				}
+				else
 				{
-					if (auto manager = g_fxo->try_get<rsx::overlays::display_manager>())
-					{
-						rsx_log.notice("Creating media list dialog with entry: '%s' (name='%s', path='%s')", title,  media->name, media->path);
-						result = manager->create<rsx::overlays::media_list_dialog>()->show(*media, title, focused, true);
-						if (result >= 0)
-						{
-							focused = 0;
-							ensure(static_cast<size_t>(result) < media->children.size());
-							media = &media->children[result];
-							rsx_log.notice("Left media list dialog with entry: '%s' ('%s')", media->name, media->path);
-							continue;
-						}
-
-						if (result == user_interface::selection_code::canceled)
-						{
-							if (media == &root_media_entry)
-							{
-								rsx_log.notice("Media list dialog canceled");
-								break;
-							}
-
-							focused = media->index;
-							media = media->parent;
-							result = 0;
-							rsx_log.notice("Media list dialog moving to parent directory (focused=%d)", focused);
-							continue;
-						}
-
-						rsx_log.error("Left media list dialog with error: '%d'", result);
-						break;
-					}
-
-					media = nullptr;
 					result = user_interface::selection_code::canceled;
 					rsx_log.error("Media selection is only possible when the native user interface is enabled in the settings. The action will be canceled.");
-					break;
 				}
 
-				if (result >= 0 && media && media->type == type)
+				if (result >= 0 && media.type == type)
 				{
-					on_finished(CELL_OK, media->info);
+					on_finished(CELL_OK, media.info);
 				}
 				else
 				{
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_media_list_dialog.h b/rpcs3/Emu/RSX/Overlays/overlay_media_list_dialog.h
index ed7e61ad71..64f31c43b9 100644
--- a/rpcs3/Emu/RSX/Overlays/overlay_media_list_dialog.h
+++ b/rpcs3/Emu/RSX/Overlays/overlay_media_list_dialog.h
@@ -39,9 +39,11 @@ namespace rsx
 
 			compiled_resource get_compiled() override;
 
-			s32 show(const media_entry& dir_entry, const std::string& title, u32 focused, bool enable_overlay);
+			s32 show(media_entry* root, media_entry& result, const std::string& title, u32 focused, bool enable_overlay);
 
 		private:
+			void reload(const std::string& title, u32 focused);
+
 			struct media_list_entry : horizontal_layout
 			{
 			public:
@@ -51,6 +53,8 @@ namespace rsx
 				std::unique_ptr<image_info> icon_data;
 			};
 
+			media_entry* m_media = nullptr;
+
 			std::unique_ptr<overlay_element> m_dim_background;
 			std::unique_ptr<list_view> m_list;
 			std::unique_ptr<label> m_description;
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp b/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp
index ad5bfe3db0..2895556e58 100644
--- a/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp
+++ b/rpcs3/Emu/RSX/Overlays/overlay_message_dialog.cpp
@@ -268,7 +268,7 @@ namespace rsx
 				}
 				else
 				{
-					while (!exit)
+					while (!m_stop_input_loop)
 					{
 						refresh();
 
@@ -279,7 +279,7 @@ namespace rsx
 			}
 			else
 			{
-				if (!exit)
+				if (!m_stop_input_loop)
 				{
 					auto& dlg_thread = g_fxo->get<named_thread<msg_dialog_thread>>();
 
@@ -307,7 +307,7 @@ namespace rsx
 						}
 						else
 						{
-							while (!exit && thread_ctrl::state() != thread_state::aborting)
+							while (!m_stop_input_loop && thread_ctrl::state() != thread_state::aborting)
 							{
 								refresh();
 
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_osk.cpp b/rpcs3/Emu/RSX/Overlays/overlay_osk.cpp
index 9bac6737d2..62635db3ea 100644
--- a/rpcs3/Emu/RSX/Overlays/overlay_osk.cpp
+++ b/rpcs3/Emu/RSX/Overlays/overlay_osk.cpp
@@ -300,7 +300,7 @@ namespace rsx
 
 			m_update = true;
 			visible = true;
-			exit = false;
+			m_stop_input_loop = false;
 
 			fade_animation.current = color4f(0.f);
 			fade_animation.end = color4f(1.f);
diff --git a/rpcs3/Emu/RSX/Overlays/overlays.cpp b/rpcs3/Emu/RSX/Overlays/overlays.cpp
index 4d8ebca5c3..a1766f9b14 100644
--- a/rpcs3/Emu/RSX/Overlays/overlays.cpp
+++ b/rpcs3/Emu/RSX/Overlays/overlays.cpp
@@ -120,7 +120,7 @@ namespace rsx
 				last_button_state[pad_index][button_id] = pressed;
 			};
 
-			while (!exit)
+			while (!m_stop_input_loop)
 			{
 				if (Emu.IsStopped())
 				{
@@ -196,7 +196,7 @@ namespace rsx
 				int pad_index = -1;
 				for (const auto& pad : handler->GetPads())
 				{
-					if (exit)
+					if (m_stop_input_loop)
 						break;
 
 					if (++pad_index >= CELL_PAD_MAX_PORT_NUM)
@@ -294,7 +294,7 @@ namespace rsx
 
 						handle_button_press(button_id, button.m_pressed, pad_index);
 
-						if (exit)
+						if (m_stop_input_loop)
 							break;
 					}
 
@@ -334,7 +334,7 @@ namespace rsx
 						// Handle currently pressed stick direction
 						handle_button_press(button_id, pressed, pad_index);
 
-						if (exit)
+						if (m_stop_input_loop)
 							break;
 					}
 				}
@@ -360,7 +360,7 @@ namespace rsx
 		{
 			// Force unload
 			m_stop_pad_interception.release(stop_pad_interception);
-			exit.release(true);
+			m_stop_input_loop.release(true);
 
 			while (u64 b = thread_bits)
 			{
diff --git a/rpcs3/Emu/RSX/Overlays/overlays.h b/rpcs3/Emu/RSX/Overlays/overlays.h
index e828c7449f..d774de437b 100644
--- a/rpcs3/Emu/RSX/Overlays/overlays.h
+++ b/rpcs3/Emu/RSX/Overlays/overlays.h
@@ -92,7 +92,7 @@ namespace rsx
 				pad_button::ls_left,
 				pad_button::ls_right
 			};
-			atomic_t<bool> exit = false;
+			atomic_t<bool> m_stop_input_loop = false;
 			atomic_t<bool> m_interactive = false;
 			bool m_start_pad_interception = true;
 			atomic_t<bool> m_stop_pad_interception = false;
diff --git a/rpcs3/main.cpp b/rpcs3/main.cpp
index 30e866707c..556a09f58f 100644
--- a/rpcs3/main.cpp
+++ b/rpcs3/main.cpp
@@ -92,7 +92,9 @@ LOG_CHANNEL(q_debug, "QDEBUG");
 
 [[noreturn]] extern void report_fatal_error(std::string_view _text)
 {
+#ifdef __linux__
 	extern void jit_announce(uptr, usz, std::string_view);
+#endif
 
 	std::string buf;