diff --git a/src/frontends/qt4/QSearch.cpp b/src/frontends/qt4/QSearch.cpp
index 21d34adb9c..3255aad10d 100644
--- a/src/frontends/qt4/QSearch.cpp
+++ b/src/frontends/qt4/QSearch.cpp
@@ -149,6 +149,8 @@ void QSearch::build_dialog()
 
 void QSearch::update_contents()
 {
+	dialog_->findPB->setFocus();
+	dialog_->findCO->setFocus();
 	dialog_->findCO->lineEdit()->selectAll();
 }
 
diff --git a/status.15x b/status.15x
index d62a447350..04e242c4c3 100644
--- a/status.15x
+++ b/status.15x
@@ -102,6 +102,8 @@ What's new
 - Remove the menu entries to swap rows/columns as this feature is not
   implemented.
 
+- Fix wrong focusing of buttons in search dialog (bug 4194).
+
 
 * DOCUMENTATION