diff --git a/tdefilereplace/knewprojectdlg.cpp b/tdefilereplace/knewprojectdlg.cpp
index bbdd8edd..06b703d2 100644
--- a/tdefilereplace/knewprojectdlg.cpp
+++ b/tdefilereplace/knewprojectdlg.cpp
@@ -220,6 +220,8 @@ void KNewProjectDlg::initGUI()
   loadBackupExtensionOptions();
   loadLocationsList();
   loadFiltersList();
+  
+  m_leSearch->setFocus();
 }
 
 void KNewProjectDlg::loadOptions()
diff --git a/tdefilereplace/tdefilereplacepart.cpp b/tdefilereplace/tdefilereplacepart.cpp
index e0bb9f97..008198e5 100644
--- a/tdefilereplace/tdefilereplacepart.cpp
+++ b/tdefilereplace/tdefilereplacepart.cpp
@@ -309,13 +309,14 @@ void TDEFileReplacePart::slotQuickStringsAdd()
 
   m_view->slotQuickStringsAdd(map[1],map[3]);
 
-  //if search-only mode == true and search-now mode == true then
-  //search string
-  if(map[0] == "N")
-    if(m_option->m_searchingOnlyMode)
+  //if search-only mode == true and search-now mode == true then search string
+  if (map[0] == "N")
+  {
+    if (m_option->m_searchingOnlyMode)
       slotSearchingOperation();
     else
       slotReplacingOperation();
+  }
 }
 
 void TDEFileReplacePart::slotStringsDeleteItem()