diff --git a/src/gui/peptide_list_view/peptidetablemodel.cpp b/src/gui/peptide_list_view/peptidetablemodel.cpp
index 70cf209fc07e61a9ad59ddae313e427f87e5de2f..c6daa2cc49547465ce44b40bdd1f9ca783200166 100644
--- a/src/gui/peptide_list_view/peptidetablemodel.cpp
+++ b/src/gui/peptide_list_view/peptidetablemodel.cpp
@@ -55,6 +55,21 @@ PeptideTableModel::setProteinMatch(ProteinMatch *p_protein_match)
   // QModelIndex topLeft = createIndex(0,0);
   // QModelIndex bottomRight = createIndex(rowCount(),columnCount());
 
+  std::set<PeptideListColumn> engine_columns;
+  for(auto &&peptide_match : _p_protein_match->getPeptideMatchList())
+    {
+      IdentificationEngine engine =
+        peptide_match.getPeptideEvidence()->getIdentificationEngine();
+      if(engine == IdentificationEngine::XTandem)
+        {
+          engine_columns.insert(PeptideListColumn::hyperscore);
+        }
+      else if(engine == IdentificationEngine::mascot)
+        {
+          engine_columns.insert(PeptideListColumn::mascot_score);
+        }
+    }
+
   _p_peptide_list_window->resizeColumnsToContents();
   // emit dataChanged(topLeft, topLeft);
   // emit headerDataChanged(Qt::Horizontal, 0,3);
diff --git a/src/gui/peptide_list_view/peptidetableproxymodel.cpp b/src/gui/peptide_list_view/peptidetableproxymodel.cpp
index b2920c3741089881c17656dff27ba2bd2fde7a18..802675094992c4fb2504c2b6e305729cadfe95f4 100644
--- a/src/gui/peptide_list_view/peptidetableproxymodel.cpp
+++ b/src/gui/peptide_list_view/peptidetableproxymodel.cpp
@@ -78,6 +78,7 @@ PeptideTableProxyModel::filterAcceptsColumn(
     }
   return _column_display[source_column];
 }
+
 bool
 PeptideTableProxyModel::filterAcceptsRow(int source_row,
                                          const QModelIndex &source_parent) const
@@ -326,7 +327,7 @@ QVariant
 PeptideTableProxyModel::data(const QModelIndex &index, int role) const
 {
 
-  //auto new_index = this->index(index.row(), mapToSource(index).column());
+  // auto new_index = this->index(index.row(), mapToSource(index).column());
   return sourceModel()->data(mapToSource(index), role);
 }