--- a/IDEFrame.py	Fri Oct 28 17:21:42 2016 +0300
+++ b/IDEFrame.py	Fri Oct 28 18:11:43 2016 +0300
@@ -1260,6 +1260,7 @@
     def OnFindMenu(self, event):
         if not self.FindDialog.IsShown():
             self.FindDialog.Show()
+            self.FindDialog.FindPattern.SetFocus()
 
     def CloseFindInPouDialog(self):
         selected = self.TabsOpened.GetSelection()
@@ -1284,10 +1285,11 @@
         dialog = SearchInProjectDialog(self)
         if dialog.ShowModal() == wx.ID_OK:
             criteria = dialog.GetCriteria()
-            result = self.Controler.SearchInProject(criteria)
-            self.ClearSearchResults()
-            self.SearchResultPanel.SetSearchResults(criteria, result)
-            self.SelectTab(self.SearchResultPanel)
+            if len(criteria) > 0:
+                result = self.Controler.SearchInProject(criteria)
+                self.ClearSearchResults()
+                self.SearchResultPanel.SetSearchResults(criteria, result)
+                self.SelectTab(self.SearchResultPanel)
 
 #-------------------------------------------------------------------------------
 #                             Display Menu Functions