diff --git a/PowerEditor/src/WinControls/FunctionList/functionListPanel.cpp b/PowerEditor/src/WinControls/FunctionList/functionListPanel.cpp
index 63a748da3..db0776f62 100644
--- a/PowerEditor/src/WinControls/FunctionList/functionListPanel.cpp
+++ b/PowerEditor/src/WinControls/FunctionList/functionListPanel.cpp
@@ -562,7 +562,7 @@ void FunctionListPanel::notified(LPNMHDR notification)
 			break;
 
 			case NM_RETURN:
-				SetWindowLongPtr(_hSelf, DWLP_MSGRESULT, 1);
+				SetWindowLongPtr(_hSelf, DWLP_MSGRESULT, 1); // remove beep
 			break;
 
 			case TVN_KEYDOWN:
@@ -582,9 +582,11 @@ void FunctionListPanel::notified(LPNMHDR notification)
 				else if (ptvkd->wVKey == VK_TAB)
 				{
 					::SetFocus(_hSearchEdit);
+					SetWindowLongPtr(_hSelf, DWLP_MSGRESULT, 1); // remove beep
 				}
 				else if (ptvkd->wVKey == VK_ESCAPE)
 				{
+					SetWindowLongPtr(_hSelf, DWLP_MSGRESULT, 1); // remove beep
 					PostMessage(_hParent, WM_COMMAND, SCEN_SETFOCUS << 16, reinterpret_cast<LPARAM>((*_ppEditView)->getHSelf()));
 				}
 			}