diff --git a/grepWinNP3/grepWinNP3.vcxproj.filters b/grepWinNP3/grepWinNP3.vcxproj.filters
index f13ace88f..3e980a793 100644
--- a/grepWinNP3/grepWinNP3.vcxproj.filters
+++ b/grepWinNP3/grepWinNP3.vcxproj.filters
@@ -22,6 +22,9 @@
     <Filter Include="translationsNP3">
       <UniqueIdentifier>{5fd907ec-eafb-47ec-aa1a-6c84ea9ec37e}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Header Files\last">
+      <UniqueIdentifier>{d46256b6-071e-4799-ac23-8cd4ad83b774}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\AboutDlg.cpp">
@@ -287,9 +290,6 @@
     <ClInclude Include="sktoolslib_mod\ThreadPool.h">
       <Filter>sktoolslib_mod</Filter>
     </ClInclude>
-    <ClInclude Include="src\last\version.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="sktoolslib_mod\PreserveChdir.h">
       <Filter>sktoolslib_mod</Filter>
     </ClInclude>
@@ -299,6 +299,9 @@
     <ClInclude Include="sktoolslib_mod\OnOutOfScope.h">
       <Filter>sktoolslib_mod</Filter>
     </ClInclude>
+    <ClInclude Include="src\last\version.h">
+      <Filter>Header Files\last</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="default.build">
diff --git a/grepWinNP3/src/SearchDlg.cpp b/grepWinNP3/src/SearchDlg.cpp
index 00338a0a2..044b62065 100644
--- a/grepWinNP3/src/SearchDlg.cpp
+++ b/grepWinNP3/src/SearchDlg.cpp
@@ -938,16 +938,7 @@ LRESULT CSearchDlg::DoCommand(int id, int msg)
                     ShowEditBalloon(IDC_SEARCHPATH, TranslatedString(hResource, IDS_ERR_INVALID_PATH).c_str(), TranslatedString(hResource, IDS_ERR_RELATIVEPATH).c_str());
                     break;
                 }
-                std::vector<std::wstring> searchpaths;
-                stringtok(searchpaths, m_searchpath, true);
-                for (const auto& sp : searchpaths)
-                {
-                    if (!PathFileExists(sp.c_str()))
-                    {
-                        ShowEditBalloon(IDC_SEARCHPATH, TranslatedString(hResource, IDS_ERR_INVALID_PATH).c_str(), TranslatedString(hResource, IDS_ERR_PATHNOTEXIST).c_str());
-                        break;
-                    }
-                }
+
                 if ((id == IDC_SEARCHINFOUNDFILES) && (!m_items.empty()))
                 {
                     m_searchpath.clear();
@@ -959,6 +950,21 @@ LRESULT CSearchDlg::DoCommand(int id, int msg)
                     }
                 }
 
+                std::vector<std::wstring> searchpaths;
+                stringtok(searchpaths, m_searchpath, true);
+                bool ok = true;
+                for (const auto& sp : searchpaths)
+                {
+                    if (!PathFileExists(sp.c_str()))
+                    {
+                        ShowEditBalloon(IDC_SEARCHPATH, TranslatedString(hResource, IDS_ERR_INVALID_PATH).c_str(), TranslatedString(hResource, IDS_ERR_PATHNOTEXIST).c_str());
+                        ok = false;
+                        break;
+                    }
+                }
+                if (!ok)
+                    break;
+
                 m_searchedItems = 0;
                 m_totalitems = 0;
 
diff --git a/grepWinNP3/src/last/version.h b/grepWinNP3/src/last/version.h
index b63b6840f..b7336fd7b 100644
--- a/grepWinNP3/src/last/version.h
+++ b/grepWinNP3/src/last/version.h
@@ -6,13 +6,13 @@
 
 //#pragma message(__LOC__"Run the NAnt script to get proper version info")
 
-#define FILEVER         2, 1, 3, 22
-#define PRODUCTVER      2, 1, 3, 22
-#define STRFILEVER      "2.1.3.22\0"
-#define STRPRODUCTVER   "2.1.3.22\0"
+#define FILEVER         2, 1, 3, 23
+#define PRODUCTVER      2, 1, 3, 23
+#define STRFILEVER      "2.1.3.23\0"
+#define STRPRODUCTVER   "2.1.3.23\0"
 
 #define GREPWIN_VERMAJOR     2
 #define GREPWIN_VERMINOR     1
 #define GREPWIN_VERMICRO     3
-#define GREPWIN_VERBUILD     22
-#define GREPWIN_VERDATE      "2020-08-05"
+#define GREPWIN_VERBUILD     23
+#define GREPWIN_VERDATE      "2020-08-12"