diff --git a/Windows/Debugger/Debugger_Disasm.cpp b/Windows/Debugger/Debugger_Disasm.cpp
index 39d29e7f62..d420ac0dd1 100644
--- a/Windows/Debugger/Debugger_Disasm.cpp
+++ b/Windows/Debugger/Debugger_Disasm.cpp
@@ -851,17 +851,17 @@ void CDisasm::SetDebugMode(bool _bDebug, bool switchPC)
 
 void CDisasm::Show(bool bShow) {
 	if (deferredSymbolFill_ && bShow) {
-		if (g_symbolMap)
+		if (g_symbolMap) {
 			g_symbolMap->FillSymbolListBox(GetDlgItem(m_hDlg, IDC_FUNCTIONLIST), ST_FUNCTION);
-		deferredSymbolFill_ = false;
+			deferredSymbolFill_ = false;
+		}
 	}
 	Dialog::Show(bShow);
 }
 
 void CDisasm::NotifyMapLoaded() {
-	if (m_bShowState == SW_SHOW) {
-		if (g_symbolMap)
-			g_symbolMap->FillSymbolListBox(GetDlgItem(m_hDlg, IDC_FUNCTIONLIST), ST_FUNCTION);
+	if (m_bShowState != SW_HIDE && g_symbolMap) {
+		g_symbolMap->FillSymbolListBox(GetDlgItem(m_hDlg, IDC_FUNCTIONLIST), ST_FUNCTION);
 	} else {
 		deferredSymbolFill_ = true;
 	}