diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp
index aafee8bcca..dd140229df 100644
--- a/ui/qt/main_window_slots.cpp
+++ b/ui/qt/main_window_slots.cpp
@@ -2116,10 +2116,10 @@ void MainWindow::on_actionEditFindPacket_triggered()
     }
     previous_focus_ = wsApp->focusWidget();
     connect(previous_focus_, SIGNAL(destroyed()), this, SLOT(resetPreviousFocus()));
-    showAccordionFrame(main_ui_->searchFrame, true);
-    if (main_ui_->searchFrame->isVisible()) {
-        main_ui_->searchFrame->setFocus();
+    if (! main_ui_->searchFrame->isVisible()) {
+        showAccordionFrame(main_ui_->searchFrame, true);
     }
+    main_ui_->searchFrame->setFocus();
 }
 
 void MainWindow::on_actionEditFindNext_triggered()
diff --git a/ui/qt/search_frame.cpp b/ui/qt/search_frame.cpp
index ffe6c183b1..b1533d4686 100644
--- a/ui/qt/search_frame.cpp
+++ b/ui/qt/search_frame.cpp
@@ -109,6 +109,7 @@ void SearchFrame::findPrevious()
 void SearchFrame::setFocus()
 {
     sf_ui_->searchLineEdit->setFocus();
+    sf_ui_->searchLineEdit->selectAll();
     cap_file_->dir = SD_FORWARD;
 }