diff --git a/src/eepp/ui/uimenu.cpp b/src/eepp/ui/uimenu.cpp
index 09ba59d47..8d5d8990b 100644
--- a/src/eepp/ui/uimenu.cpp
+++ b/src/eepp/ui/uimenu.cpp
@@ -418,7 +418,7 @@ void UIMenu::safeHide() {
 }
 
 void UIMenu::unselectSelected() {
-	if ( nullptr != mItemSelected )
+	if ( nullptr != mItemSelected && isChild( mItemSelected ) )
 		mItemSelected->popState( UIState::StateSelected );
 	mItemSelected = nullptr;
 	mItemSelectedIndex = eeINDEX_NOT_FOUND;
diff --git a/src/tools/ecode/plugins/debugger/dap/debuggerclientdap.cpp b/src/tools/ecode/plugins/debugger/dap/debuggerclientdap.cpp
index 3131c3239..c30a43b00 100644
--- a/src/tools/ecode/plugins/debugger/dap/debuggerclientdap.cpp
+++ b/src/tools/ecode/plugins/debugger/dap/debuggerclientdap.cpp
@@ -161,7 +161,7 @@ void DebuggerClientDap::requestInitialize() {
 		{ DAP_SUPPORTS_VARIABLE_TYPE, true },
 		{ DAP_SUPPORTS_VARIABLE_PAGING, false },
 		{ DAP_SUPPORTS_RUN_IN_TERMINAL_REQUEST, true },
-		{ DAP_SUPPORTS_MEMORY_REFERENCES, false },
+		{ DAP_SUPPORTS_MEMORY_REFERENCES, true },
 		{ DAP_SUPPORTS_PROGRESS_REPORTING, false },
 		{ DAP_SUPPORTS_INVALIDATED_EVENT, false },
 		{ DAP_SUPPORTS_MEMORY_EVENT, false } };