diff --git a/gui/src/Catalogue/CatalogueEventsWidget.cpp b/gui/src/Catalogue/CatalogueEventsWidget.cpp
index e1e73ae..3fe0065 100644
--- a/gui/src/Catalogue/CatalogueEventsWidget.cpp
+++ b/gui/src/Catalogue/CatalogueEventsWidget.cpp
@@ -45,9 +45,10 @@ CatalogueEventsWidget::CatalogueEventsWidget(QWidget *parent)
 
     connect(ui->tableWidget, &QTableWidget::itemSelectionChanged, [this]() {
         auto selection = ui->tableWidget->selectedRanges();
-        auto isSingleSelection = selection.count() == 1 && selection.first().rowCount() == 1;
-        ui->btnChart->setEnabled(isSingleSelection);
-        ui->btnTime->setEnabled(isSingleSelection);
+        auto isNotMultiSelection
+            = selection.isEmpty() || (selection.count() == 1 && selection.first().rowCount() == 1);
+        ui->btnChart->setEnabled(isNotMultiSelection);
+        ui->btnTime->setEnabled(isNotMultiSelection);
     });
 
     Q_ASSERT(impl->columnNames().count() == (int)CatalogueEventsWidgetPrivate::Column::NbColumn);
diff --git a/gui/src/Catalogue/CatalogueExplorer.cpp b/gui/src/Catalogue/CatalogueExplorer.cpp
index 30420f2..c286298 100644
--- a/gui/src/Catalogue/CatalogueExplorer.cpp
+++ b/gui/src/Catalogue/CatalogueExplorer.cpp
@@ -8,12 +8,12 @@ CatalogueExplorer::CatalogueExplorer(QWidget *parent)
     ui->setupUi(this);
 
     connect(ui->catalogues, &CatalogueSideBarWidget::catalogueSelected, [this](auto name) {
-        ui->inspector->setEvent(name);
+        ui->inspector->setCatalogue(name);
         ui->events->populateWithCatalogue(name);
     });
 
     connect(ui->events, &CatalogueEventsWidget::eventSelected,
-            [this](auto name) { ui->inspector->setCatalogue(name); });
+            [this](auto name) { ui->inspector->setEvent(name); });
 }
 
 CatalogueExplorer::~CatalogueExplorer()