diff --git a/qt/search_panel.cpp b/qt/search_panel.cpp
index 1e7523c516..921af8e189 100644
--- a/qt/search_panel.cpp
+++ b/qt/search_panel.cpp
@@ -34,6 +34,9 @@ SearchPanel::SearchPanel(DrawWidget * drawWidget, QWidget * parent)
   // for multithreading support
   connect(this, SIGNAL(SearchResultSignal(search::Result *)),
           this, SLOT(OnSearchResult(search::Result *)), Qt::QueuedConnection);
+
+  setFocusPolicy(Qt::StrongFocus);
+  setFocusProxy(m_pEditor);
 }
 
 template<class T> static void ClearVector(vector<T *> & v)
@@ -95,14 +98,4 @@ void SearchPanel::OnSearchPanelItemClicked(int row, int)
   }
 }
 
-void SearchPanel::showEvent(QShowEvent *)
-{
-  m_pEditor->setFocus();
-}
-
-void SearchPanel::hideEvent(QHideEvent *)
-{
-  m_pEditor->clearFocus();
-}
-
 }
diff --git a/qt/search_panel.hpp b/qt/search_panel.hpp
index 14f762d861..bd7ff9617f 100644
--- a/qt/search_panel.hpp
+++ b/qt/search_panel.hpp
@@ -31,10 +31,6 @@ signals:
 private:
   void SearchResultThreadFunc(search::Result const & result);
 
-protected:
-  virtual void showEvent(QShowEvent *);
-  virtual void hideEvent(QHideEvent *);
-
 public:
   explicit SearchPanel(DrawWidget * drawWidget, QWidget * parent);
   ~SearchPanel();