--- a/ui/mainwindow.cpp	Mon Apr 28 10:43:59 2014 +0000
+++ b/ui/mainwindow.cpp	Mon Apr 28 10:44:20 2014 +0000
@@ -533,24 +533,32 @@
     }
 
     // Add separators and certificates to list widget.
-    mCertListWidget->addItem(createSeparator(tr("New certificates to install"), i++));
-    foreach (const Certificate &cert, newInstallCerts) {
-        mCertListWidget->addItem(createListItem(cert, Certificate::InstallNew, i++));
+    if (!newInstallCerts.isEmpty()) {
+        mCertListWidget->addItem(createSeparator(tr("New certificates to install"), i++));
+        foreach (const Certificate &cert, newInstallCerts) {
+            mCertListWidget->addItem(createListItem(cert, Certificate::InstallNew, i++));
+        }
     }
 
-    mCertListWidget->addItem(createSeparator(tr("New certificates to remove"), i++));
-    foreach (const Certificate &cert, newRemoveCerts) {
-        mCertListWidget->addItem(createListItem(cert, Certificate::RemoveNew, i++));
+    if (!newRemoveCerts.isEmpty()) {
+        mCertListWidget->addItem(createSeparator(tr("New certificates to remove"), i++));
+        foreach (const Certificate &cert, newRemoveCerts) {
+            mCertListWidget->addItem(createListItem(cert, Certificate::RemoveNew, i++));
+        }
     }
 
-    mCertListWidget->addItem(createSeparator(tr("Old certificates to install"), i++));
-    foreach (const Certificate &cert, oldInstallCerts) {
-        mCertListWidget->addItem(createListItem(cert, Certificate::InstallOld, i++));
+    if (!oldInstallCerts.isEmpty()) {
+        mCertListWidget->addItem(createSeparator(tr("Old certificates to install"), i++));
+        foreach (const Certificate &cert, oldInstallCerts) {
+            mCertListWidget->addItem(createListItem(cert, Certificate::InstallOld, i++));
+        }
     }
 
-    mCertListWidget->addItem(createSeparator(tr("Old certificates to remove"), i++));
-    foreach (const Certificate &cert, oldRemoveCerts) {
-        mCertListWidget->addItem(createListItem(cert, Certificate::RemoveOld, i++));
+    if (!oldRemoveCerts.isEmpty()) {
+        mCertListWidget->addItem(createSeparator(tr("Old certificates to remove"), i++));
+        foreach (const Certificate &cert, oldRemoveCerts) {
+            mCertListWidget->addItem(createListItem(cert, Certificate::RemoveOld, i++));
+        }
     }
 }