From da26ec346593e38149e6aa17fcefe653fc891e6c Mon Sep 17 00:00:00 2001
From: Whindmar Saksit <whindsaks@proton.me>
Date: Sun, 8 Sep 2024 13:45:51 +0200
Subject: [PATCH] [NOTEPAD] Don't handle main window accelerators in Find
 dialog (#7320)

---
 base/applications/notepad/main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/base/applications/notepad/main.c b/base/applications/notepad/main.c
index 3668527a0d9..fa5580eb739 100644
--- a/base/applications/notepad/main.c
+++ b/base/applications/notepad/main.c
@@ -637,8 +637,8 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE prev, LPTSTR cmdline, int sh
 
     while (GetMessage(&msg, NULL, 0, 0))
     {
-        if (!TranslateAccelerator(Globals.hMainWnd, hAccel, &msg) &&
-            !IsDialogMessage(Globals.hFindReplaceDlg, &msg))
+        if ((!Globals.hFindReplaceDlg || !IsDialogMessage(Globals.hFindReplaceDlg, &msg)) &&
+            !TranslateAccelerator(Globals.hMainWnd, hAccel, &msg))
         {
             TranslateMessage(&msg);
             DispatchMessage(&msg);