diff --git a/rpcs3/rpcs3qt/cheat_manager.cpp b/rpcs3/rpcs3qt/cheat_manager.cpp
index ac43de6ce0..8f4d82d9c9 100644
--- a/rpcs3/rpcs3qt/cheat_manager.cpp
+++ b/rpcs3/rpcs3qt/cheat_manager.cpp
@@ -851,7 +851,7 @@ cheat_manager_dialog::cheat_manager_dialog(QWidget* parent)
 			update_cheat_list();
 		});
 
-		connect(show_in_mem_viewer, &QAction::triggered, [offset]()
+		connect(show_in_mem_viewer, &QAction::triggered, this, [offset]()
 		{
 			memory_viewer_panel::ShowAtPC(offset);
 		});
diff --git a/rpcs3/rpcs3qt/hex_validator.h b/rpcs3/rpcs3qt/hex_validator.h
index 63ada7a17a..6a67133549 100644
--- a/rpcs3/rpcs3qt/hex_validator.h
+++ b/rpcs3/rpcs3qt/hex_validator.h
@@ -84,7 +84,7 @@ inline bool parse_hex_qstring(const QString& input, quint64* result, int max_bit
 	bool ok = false;
 	const quint64 value = norm.toULongLong(&ok, 16);
 
-	if (ok)
+	if (ok && result)
 		*result = static_cast<u64>(value);
 
 	return ok;
diff --git a/rpcs3/rpcs3qt/log_frame.cpp b/rpcs3/rpcs3qt/log_frame.cpp
index 08d8236ed0..ea06912a7f 100644
--- a/rpcs3/rpcs3qt/log_frame.cpp
+++ b/rpcs3/rpcs3qt/log_frame.cpp
@@ -253,9 +253,9 @@ void log_frame::CreateAndConnectActions()
 	});
 
 	m_perform_show_in_mem_viewer = new QAction(tr("Show in Memory Viewer"), this);
-	connect(m_perform_show_in_mem_viewer, &QAction::triggered, [this]()
+	connect(m_perform_show_in_mem_viewer, &QAction::triggered, this, [this]()
 	{
-		QPlainTextEdit* pte = (m_tabWidget->currentIndex() == 1 ? m_tty : m_log);
+		const QPlainTextEdit* pte = (m_tabWidget->currentIndex() == 1 ? m_tty : m_log);
 		const QString selected = pte->textCursor().selectedText();
 		quint64 pc = 0;
 		if (!parse_hex_qstring(selected, &pc))
diff --git a/rpcs3/rpcs3qt/memory_viewer_panel.cpp b/rpcs3/rpcs3qt/memory_viewer_panel.cpp
index 057989fe78..ccc648718a 100644
--- a/rpcs3/rpcs3qt/memory_viewer_panel.cpp
+++ b/rpcs3/rpcs3qt/memory_viewer_panel.cpp
@@ -28,9 +28,6 @@
 
 LOG_CHANNEL(gui_log, "GUI");
 
-class CPUDisAsm;
-std::shared_ptr<CPUDisAsm> make_basic_ppu_disasm();
-
 constexpr auto qstr = QString::fromStdString;
 
 memory_viewer_panel::memory_viewer_panel(QWidget* parent, std::shared_ptr<CPUDisAsm> disasm, u32 addr, std::function<cpu_thread*()> func)
@@ -1255,7 +1252,7 @@ void memory_viewer_panel::ShowAtPC(u32 pc)
 
 	if (!handle_ptr)
 	{
-		idm::make<memory_viewer_handle>(nullptr, make_basic_ppu_disasm(), pc);
+		idm::make<memory_viewer_handle>(nullptr, nullptr, pc);
 		return;
 	}