diff --git a/gui/newsuppressiondialog.cpp b/gui/newsuppressiondialog.cpp
index 59cb6f02d..7a25e9e5e 100644
--- a/gui/newsuppressiondialog.cpp
+++ b/gui/newsuppressiondialog.cpp
@@ -38,6 +38,8 @@ Suppressions::Suppression NewSuppressionDialog::getSuppression() const
 {
     Suppressions::Suppression ret;
     ret.errorId = mUI->mComboErrorId->currentText().toStdString();
+    if (ret.errorId.empty())
+        ret.errorId = "*";
     ret.fileName = mUI->mTextFileName->text().toStdString();
     ret.lineNumber = mUI->mTextLineNumber->text().toInt();
     ret.symbolName = mUI->mTextSymbolName->text().toStdString();
diff --git a/gui/newsuppressiondialog.ui b/gui/newsuppressiondialog.ui
index bdeb5bf2a..ae9a76995 100644
--- a/gui/newsuppressiondialog.ui
+++ b/gui/newsuppressiondialog.ui
@@ -77,6 +77,12 @@
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>mComboErrorId</tabstop>
+  <tabstop>mTextFileName</tabstop>
+  <tabstop>mTextLineNumber</tabstop>
+  <tabstop>mTextSymbolName</tabstop>
+ </tabstops>
  <resources/>
  <connections>
   <connection>