diff --git a/gui/src/Catalogue/CatalogueInspectorWidget.cpp b/gui/src/Catalogue/CatalogueInspectorWidget.cpp
index 3c6b730..a51f4a7 100644
--- a/gui/src/Catalogue/CatalogueInspectorWidget.cpp
+++ b/gui/src/Catalogue/CatalogueInspectorWidget.cpp
@@ -63,6 +63,19 @@ void CatalogueInspectorWidget::CatalogueInspectorWidgetPrivate::connectEventUpda
         }
     });
 
+    connect(ui->leEventTags, &QLineEdit::editingFinished, [ui, inspector, this]() {
+        auto tags = ui->leEventTags->text().split(QRegExp("\\s+"));
+        std::list<QString> tagNames;
+        for (auto tag : tags) {
+            tagNames.push_back(tag);
+        }
+
+        if (m_DisplayedEvent->getTagsNames() != tagNames) {
+            m_DisplayedEvent->setTagsNames(tagNames);
+            emit inspector->eventUpdated(m_DisplayedEvent);
+        }
+    });
+
     connect(ui->leEventProduct, &QLineEdit::editingFinished, [ui, inspector, this]() {
         if (ui->leEventProduct->text() != m_DisplayedEventProduct->getProductId()) {
             m_DisplayedEventProduct->setProductId(ui->leEventProduct->text());
@@ -70,10 +83,6 @@ void CatalogueInspectorWidget::CatalogueInspectorWidgetPrivate::connectEventUpda
         }
     });
 
-    connect(ui->leEventTags, &QLineEdit::editingFinished, [ui, inspector, this]() {
-        // TODO
-    });
-
     connect(ui->dateTimeEventTStart, &QDateTimeEdit::editingFinished, [ui, inspector, this]() {
         auto time = DateUtils::secondsSinceEpoch(ui->dateTimeEventTStart->dateTime());
         if (time != m_DisplayedEventProduct->getTStart()) {
@@ -115,9 +124,9 @@ void CatalogueInspectorWidget::setEvent(const std::shared_ptr<DBEvent> &event)
         QString::number(event->getEventProducts().size()).append(" product(s)"));
 
     QString tagList;
-    auto tags = event->getTags();
+    auto tags = event->getTagsNames();
     for (auto tag : tags) {
-        tagList += tag.getName();
+        tagList += tag;
         tagList += ' ';
     }