1 files changed, 9 insertions, 1 deletions
diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp
index 8f675926d9..1b153ce19a 100644
--- a/ui/qt/main_window_slots.cpp
+++ b/ui/qt/main_window_slots.cpp
@@ -909,7 +909,15 @@ gboolean MainWindow::filter_expression_add_action(const void *key _U_, void *val
         return FALSE;
 
     QAction *dfb_action = new QAction(fe->label, data->window->filter_expression_toolbar_);
-    dfb_action->setToolTip(fe->expression);
+    if (strlen(fe->comment) > 0)
+    {
+        QString tooltip = QString("%1, %2").arg(fe->expression).arg(fe->comment);
+        dfb_action->setToolTip(tooltip);
+    }
+    else
+    {
+        dfb_action->setToolTip(fe->expression);
+    }
     dfb_action->setData(fe->expression);
     dfb_action->setProperty(dfe_property_, true);
     data->window->filter_expression_toolbar_->addAction(dfb_action);