diff --git a/distrib/Notepad3.ini b/distrib/Notepad3.ini
index 051fb93b5..66b8a508b 100644
Binary files a/distrib/Notepad3.ini and b/distrib/Notepad3.ini differ
diff --git a/src/Edit.c b/src/Edit.c
index acba0d751..23b3e91c8 100644
--- a/src/Edit.c
+++ b/src/Edit.c
@@ -4797,6 +4797,7 @@ INT_PTR CALLBACK EditFindReplaceDlgProcW(HWND hwnd,UINT umsg,WPARAM wParam,LPARA
               }
             }
             iSaveMarkOcc = -1;
+            InvalidateRect(GetDlgItem(hwnd, IDC_FINDTEXT), NULL, TRUE);
           }
           bFlagsChanged = TRUE;
           SetTimer(hwnd, IDT_TIMER_MRKALL, 100, NULL);
@@ -4819,11 +4820,10 @@ INT_PTR CALLBACK EditFindReplaceDlgProcW(HWND hwnd,UINT umsg,WPARAM wParam,LPARA
               // we have to set Sci's regex instance to first find (have substitution in place)
               EditFindHasMatch(hwndEdit, lpefr, FALSE, TRUE);
               bFlagsChanged = FALSE;
+              InvalidateRect(GetDlgItem(hwnd, IDC_FINDTEXT), NULL, TRUE);
               EndWaitCursor();
             }
           }
-          InvalidateRect(GetDlgItem(hwnd, IDC_FINDTEXT), NULL, TRUE);
-          UpdateWindow(GetDlgItem(hwnd, IDC_FINDTEXT));
         }
         break;
 
diff --git a/src/Notepad3.c b/src/Notepad3.c
index 5ca458de3..9a43d88c7 100644
--- a/src/Notepad3.c
+++ b/src/Notepad3.c
@@ -2559,7 +2559,6 @@ LRESULT MsgCommand(HWND hwnd,WPARAM wParam,LPARAM lParam)
             PathCchAppend(tchExeFile,COUNTOF(tchExeFile),L"minipath.exe");
           }
         }
-
         else {
           ExtractFirstArgument(tchTemp,tchExeFile,tchParam,MAX_PATH+4);
           if (PathIsRelative(tchExeFile)) {
@@ -5931,11 +5930,11 @@ void LoadSettings()
   dwFileCheckInverval = IniSectionGetInt(pIniSection,L"FileCheckInverval",2000);
   dwAutoReloadTimeout = IniSectionGetInt(pIniSection,L"AutoReloadTimeout",2000);
 
-  iSciDirectWriteTech = IniSectionGetInt(pIniSection,L"SciDirectWriteTech", SC_TECHNOLOGY_DEFAULT);
+  iSciDirectWriteTech = IniSectionGetInt(pIniSection,L"SciDirectWriteTech", DirectWriteTechnology[0]);
   iSciDirectWriteTech = max(min(iSciDirectWriteTech,3),-1);
 
-  iSciFontQuality = IniSectionGetInt(pIniSection,L"SciFontQuality", SC_EFF_QUALITY_DEFAULT);
-  iSciFontQuality = max(min(iSciFontQuality, SC_EFF_QUALITY_LCD_OPTIMIZED), SC_EFF_QUALITY_DEFAULT);
+  iSciFontQuality = IniSectionGetInt(pIniSection,L"SciFontQuality", FontQuality[3]);
+  iSciFontQuality = max(min(iSciFontQuality, 3), 0);
 
   iMarkOccurrencesCount = -1;
   iMarkOccurrencesMaxCount = IniSectionGetInt(pIniSection,L"MarkOccurrencesMaxCount",2000);
@@ -5987,12 +5986,12 @@ void LoadSettings()
 
   // ---  override by resolution specific settings  ---
 
-  WCHAR tchSciDirectWriteTech[32];
+  WCHAR tchSciDirectWriteTech[64];
   StringCchPrintf(tchSciDirectWriteTech,COUNTOF(tchSciDirectWriteTech),L"%ix%i SciDirectWriteTech",ResX,ResY);
   iSciDirectWriteTech = IniSectionGetInt(pIniSection,tchSciDirectWriteTech,iSciDirectWriteTech);
   iSciDirectWriteTech = max(min(iSciDirectWriteTech,3),-1);
 
-  WCHAR tchSciFontQuality[32];
+  WCHAR tchSciFontQuality[64];
   StringCchPrintf(tchSciFontQuality,COUNTOF(tchSciFontQuality),L"%ix%i SciFontQuality",ResX,ResY);
   iSciFontQuality = IniSectionGetInt(pIniSection,tchSciFontQuality,iSciFontQuality);
   iSciFontQuality = max(min(iSciFontQuality, SC_EFF_QUALITY_LCD_OPTIMIZED), SC_TECHNOLOGY_DEFAULT);