1 files changed, 4 insertions, 2 deletions
diff --git a/ui/qt/filter_expression_frame.cpp b/ui/qt/filter_expression_frame.cpp
index b67eba6adf..72e2ecf282 100644
--- a/ui/qt/filter_expression_frame.cpp
+++ b/ui/qt/filter_expression_frame.cpp
@@ -56,7 +56,6 @@ void FilterExpressionFrame::addExpression(const QString filter_text)
         return;
     }
 
-    ui->labelLineEdit->setText(tr("Apply this filter"));
     ui->displayFilterLineEdit->setText(filter_text);
 }
 
@@ -79,7 +78,7 @@ void FilterExpressionFrame::updateWidgets()
     ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(ok_enable);
 }
 
-void FilterExpressionFrame::on_filterExpressionPreferencesToolButton_clicked()
+void FilterExpressionFrame::on_filterExpressionPreferencesPushButton_clicked()
 {
     on_buttonBox_rejected();
     emit showPreferencesDialog(PreferencesDialog::ppFilterExpressions);
@@ -97,6 +96,9 @@ void FilterExpressionFrame::on_buttonBox_accepted()
     QByteArray expr_ba = ui->displayFilterLineEdit->text().toUtf8();
     QByteArray comment_ba = ui->commentLineEdit->text().toUtf8();
 
+    if ( ui->labelLineEdit->text().length() == 0 )
+        return;
+
     filter_expression_new(label_ba.constData(), expr_ba.constData(), comment_ba.constData(), TRUE);
 
     on_buttonBox_rejected();