1 files changed, 10 insertions, 4 deletions
diff --git a/ui/qt/search_frame.cpp b/ui/qt/search_frame.cpp
index ef20ec16b6..feea246b5c 100644
--- a/ui/qt/search_frame.cpp
+++ b/ui/qt/search_frame.cpp
@@ -274,9 +274,6 @@ void SearchFrame::updateWidgets()
         return;
     }
 
-    // Enable completion only for display filter search.
-    sf_ui_->searchLineEdit->allowCompletion(search_type == df_search_);
-
     if (sf_ui_->searchLineEdit->text().isEmpty() || sf_ui_->searchLineEdit->syntaxState() == SyntaxLineEdit::Invalid) {
         sf_ui_->findButton->setEnabled(false);
     } else {
@@ -343,7 +340,16 @@ void SearchFrame::on_searchTypeComboBox_currentIndexChanged(int idx)
         break;
     }
 
-    wsApp->popStatus(WiresharkApplication::FilterSyntax);
+    // Enable completion only for display filter search.
+    sf_ui_->searchLineEdit->allowCompletion(idx == df_search_);
+
+    if (idx == df_search_) {
+        sf_ui_->searchLineEdit->checkFilter();
+    } else {
+        sf_ui_->searchLineEdit->setToolTip(QString());
+        wsApp->popStatus(WiresharkApplication::FilterSyntax);
+    }
+
     updateWidgets();
 }