--- a/ui/administratorwindow.cpp	Mon Oct 13 17:41:12 2014 +0200
+++ b/ui/administratorwindow.cpp	Mon Oct 13 17:41:55 2014 +0200
@@ -198,8 +198,7 @@
     QModelIndexList list = certificateView->selectionModel()->selectedRows();
     foreach (QModelIndex idx, list) {
         QModelIndex realidx = mFilterModel->mapToSource(idx);
-        qDebug() << "About to remove row: " << realidx.row();
-        if (certificateModel->data(idx, Qt::UserRole).toBool()) {
+        if (!idx.data(Qt::UserRole).toBool()) {
             certificateModel->removeRow(realidx.row(), realidx.parent());
         } else {
             qDebug() << "Tried to remove old certificate at idx: " << realidx.row();;
@@ -237,12 +236,15 @@
 
 void AdministratorWindow::clickedCertificate(const QModelIndex &index)
 {
-    if (index.data(Qt::UserRole).toBool()) {
-        removeButton->setEnabled(false);
+    QModelIndexList list = certificateView->selectionModel()->selectedRows();
+    bool all_are_removable = true;
+    foreach (QModelIndex idx, list) {
+        if (idx.data(Qt::UserRole).toBool()) {
+            all_are_removable = false;
+            break;
+        }
     }
-    else {
-        removeButton->setEnabled(true);
-    }
+    removeButton->setEnabled(all_are_removable);
 }
 
 void AdministratorWindow::logChanges(const QString &currentCerts, const QString& keyFingerprint)