diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c
index 5878da8..8444044 100644
--- a/programs/notepad/dialog.c
+++ b/programs/notepad/dialog.c
@@ -923,7 +923,7 @@ VOID DIALOG_FilePrint(VOID)
     di.lpszDocName = Globals.szFileTitle;
     di.lpszOutput = NULL;
     di.lpszDatatype = NULL;
-    di.fwType = 0; 
+    di.fwType = 0;
 
     if(printer.Flags & PD_PRINTTOFILE)
     {
@@ -1132,28 +1132,38 @@ VOID DIALOG_SelectFont(VOID)
     }
 }
 
-VOID DIALOG_Search(VOID)
+static VOID DIALOG_SearchDialog(BOOL bIsReplace)
 {
-        /* Allow only one search/replace dialog to open */
-        if(Globals.hFindReplaceDlg != NULL)
-        {
-            SetActiveWindow(Globals.hFindReplaceDlg);
-            return;
-        }
+    /* Allow only one search/replace dialog to open */
+    if(Globals.hFindReplaceDlg != NULL)
+    {
+        SetActiveWindow(Globals.hFindReplaceDlg);
+        return;
+    }
 
-        ZeroMemory(&Globals.find, sizeof(Globals.find));
-        Globals.find.lStructSize      = sizeof(Globals.find);
-        Globals.find.hwndOwner        = Globals.hMainWnd;
-        Globals.find.hInstance        = Globals.hInstance;
-        Globals.find.lpstrFindWhat    = Globals.szFindText;
-        Globals.find.wFindWhatLen     = ARRAY_SIZE(Globals.szFindText);
-        Globals.find.Flags            = FR_DOWN|FR_HIDEWHOLEWORD;
+    ZeroMemory(&Globals.find, sizeof(Globals.find));
+    Globals.find.lStructSize      = sizeof(Globals.find);
+    Globals.find.hwndOwner        = Globals.hMainWnd;
+    Globals.find.hInstance        = Globals.hInstance;
+    Globals.find.lpstrFindWhat    = Globals.szFindText;
+    Globals.find.wFindWhatLen     = ARRAY_SIZE(Globals.szFindText);
+    Globals.find.lpstrReplaceWith = Globals.szReplaceText;
+    Globals.find.wReplaceWithLen  = ARRAY_SIZE(Globals.szReplaceText);
+    Globals.find.Flags            = FR_DOWN|FR_HIDEWHOLEWORD;
+
+    /* We only need to create the modal FindReplace dialog which will */
+    /* notify us of incoming events using hMainWnd Window Messages    */
+    if (bIsReplace)
+        Globals.hFindReplaceDlg = ReplaceTextW(&Globals.find);
+    else
+        Globals.hFindReplaceDlg = FindTextW(&Globals.find);
 
-        /* We only need to create the modal FindReplace dialog which will */
-        /* notify us of incoming events using hMainWnd Window Messages    */
+    assert(Globals.hFindReplaceDlg !=0);
+}
 
-        Globals.hFindReplaceDlg = FindTextW(&Globals.find);
-        assert(Globals.hFindReplaceDlg !=0);
+VOID DIALOG_Search(VOID)
+{
+    DIALOG_SearchDialog(FALSE);
 }
 
 VOID DIALOG_SearchNext(VOID)
@@ -1166,28 +1176,7 @@ VOID DIALOG_SearchNext(VOID)
 
 VOID DIALOG_Replace(VOID)
 {
-        /* Allow only one search/replace dialog to open */
-        if(Globals.hFindReplaceDlg != NULL)
-        {
-            SetActiveWindow(Globals.hFindReplaceDlg);
-            return;
-        }
-
-        ZeroMemory(&Globals.find, sizeof(Globals.find));
-        Globals.find.lStructSize      = sizeof(Globals.find);
-        Globals.find.hwndOwner        = Globals.hMainWnd;
-        Globals.find.hInstance        = Globals.hInstance;
-        Globals.find.lpstrFindWhat    = Globals.szFindText;
-        Globals.find.wFindWhatLen     = ARRAY_SIZE(Globals.szFindText);
-        Globals.find.lpstrReplaceWith = Globals.szReplaceText;
-        Globals.find.wReplaceWithLen  = ARRAY_SIZE(Globals.szReplaceText);
-        Globals.find.Flags            = FR_DOWN|FR_HIDEWHOLEWORD;
-
-        /* We only need to create the modal FindReplace dialog which will */
-        /* notify us of incoming events using hMainWnd Window Messages    */
-
-        Globals.hFindReplaceDlg = ReplaceTextW(&Globals.find);
-        assert(Globals.hFindReplaceDlg !=0);
+    DIALOG_SearchDialog(TRUE);
 }
 
 VOID DIALOG_HelpContents(VOID)
@@ -1273,5 +1262,5 @@ static INT_PTR WINAPI DIALOG_PAGESETUP_DlgProc(HWND hDlg, UINT msg, WPARAM wPara
        break;
     }
 
-  return FALSE;
+    return FALSE;
 }