diff --git a/companion/src/labels.cpp b/companion/src/labels.cpp
index 5d07531d74f..95a7542d528 100644
--- a/companion/src/labels.cpp
+++ b/companion/src/labels.cpp
@@ -216,7 +216,7 @@ void LabelsModel::buildLabelsList()
   }
 
   if (i) {
-    emit dataChanged(index(0,0), index(i - 1, 0));
+    emit dataChanged(index(0, 0), index(i - 1, 0));
   }
 }
 
diff --git a/companion/src/mdichild.cpp b/companion/src/mdichild.cpp
index 3a8fd4d65f7..1df017be3b8 100644
--- a/companion/src/mdichild.cpp
+++ b/companion/src/mdichild.cpp
@@ -1757,7 +1757,8 @@ void MdiChild::modelLabelsChanged(int index)
 {
   setWindowModified(true);
   refresh();
-  ui->modelsList->selectionModel()->select(modelsListModel->getIndexForModel(index), QItemSelectionModel::ClearAndSelect |
+  const QModelIndex idx = modelsListProxyModel->mapFromSource(modelsListModel->getIndexForModel(index));
+  ui->modelsList->selectionModel()->select(idx, QItemSelectionModel::ClearAndSelect |
                                                                            QItemSelectionModel::Rows);
 }