diff --git a/core/event.c b/core/event.c
index defdffc34..8019cacd7 100644
--- a/core/event.c
+++ b/core/event.c
@@ -80,7 +80,7 @@ struct event *create_event(unsigned int time, int type, int flags, int value, co
 		break;
 	}
 
-	remember_event_name(name);
+	remember_event_name(name, flags);
 
 	return ev;
 }
diff --git a/core/eventname.cpp b/core/eventname.cpp
index 4289d3d83..2404fe81e 100644
--- a/core/eventname.cpp
+++ b/core/eventname.cpp
@@ -8,15 +8,16 @@
 
 struct event_name {
 	std::string name;
+	int flags;
 	bool plot;
 };
 
 static std::vector<event_name> event_names;
 
 // Small helper so that we can compare events to C-strings
-static bool operator==(const event_name &en, const char *s)
+static bool operator==(const event_name &en1, const event_name &en2)
 {
-	return en.name == s;
+	return en1.name == en2.name && en1.flags == en2.flags;
 }
 
 extern "C" void clear_event_names()
@@ -24,21 +25,28 @@ extern "C" void clear_event_names()
 	event_names.clear();
 }
 
-extern "C" void remember_event_name(const char *eventname)
+extern "C" void remember_event_name(const char *eventname, const int flags)
 {
 	if (empty_string(eventname))
 		return;
-	if (std::find(event_names.begin(), event_names.end(), eventname) != event_names.end())
+	if (std::find(event_names.begin(), event_names.end(), event_name{ eventname, flags }) != event_names.end())
 		return;
-	event_names.push_back({ eventname, true });
+	event_names.push_back({ eventname, flags, true });
 }
 
-extern "C" bool is_event_hidden(const char *eventname)
+extern "C" bool is_event_hidden(const char *eventname, const int flags)
 {
-	auto it = std::find(event_names.begin(), event_names.end(), eventname);
+	auto it = std::find(event_names.begin(), event_names.end(), event_name{ eventname, flags });
 	return it != event_names.end() && !it->plot;
 }
 
+extern "C" void hide_similar_events(const char *eventname, const int flags)
+{
+	auto it = std::find(event_names.begin(), event_names.end(), event_name{ eventname, flags });
+	if (it != event_names.end())
+		it->plot = false;
+}
+
 extern "C" void show_all_events()
 {
 	for (event_name &en: event_names)
diff --git a/core/eventname.h b/core/eventname.h
index beaac5c32..bf22c9375 100644
--- a/core/eventname.h
+++ b/core/eventname.h
@@ -8,8 +8,9 @@ extern "C" {
 #endif
 
 extern void clear_event_names(void);
-extern void remember_event_name(const char *eventname);
-extern bool is_event_hidden(const char *eventname);
+extern void remember_event_name(const char *eventname, const int flags);
+extern bool is_event_hidden(const char *eventname, const int flags);
+extern void hide_similar_events(const char *eventname, const int flags);
 extern void show_all_events();
 extern bool any_events_hidden();
 
diff --git a/profile-widget/diveeventitem.cpp b/profile-widget/diveeventitem.cpp
index 9b701286d..8c91fb6fd 100644
--- a/profile-widget/diveeventitem.cpp
+++ b/profile-widget/diveeventitem.cpp
@@ -226,7 +226,7 @@ bool DiveEventItem::isInteresting(const struct dive *d, const struct divecompute
 
 bool DiveEventItem::shouldBeHidden()
 {
-	return is_event_hidden(ev->name);
+	return is_event_hidden(ev->name, ev->flags);
 }
 
 void DiveEventItem::recalculatePos()
diff --git a/profile-widget/profilewidget2.cpp b/profile-widget/profilewidget2.cpp
index b90105187..0b4e2208f 100644
--- a/profile-widget/profilewidget2.cpp
+++ b/profile-widget/profilewidget2.cpp
@@ -656,7 +656,7 @@ void ProfileWidget2::contextMenuEvent(QContextMenuEvent *event)
 		}
 #endif
 	}
-	if (any_events_hidden())
+	if (any_events_hidden() || std::any_of(profileScene->eventItems.begin(), profileScene->eventItems.end(), [] (const DiveEventItem *item) { return !item->isVisible(); }))
 		m.addAction(tr("Unhide all events"), this, &ProfileWidget2::unhideEvents);
 	m.exec(event->globalPos());
 }
@@ -701,13 +701,10 @@ void ProfileWidget2::hideSimilarEvents(DiveEventItem *item)
 {
 	const struct event *event = item->getEvent();
 
-	hideEvent(item);
-
 	if (!empty_string(event->name)) {
-		for (DiveEventItem *evItem: profileScene->eventItems) {
-			if (same_string(evItem->getEvent()->name, event->name) && evItem->getEvent()->flags == event->flags)
-				evItem->hide();
-		}
+		hide_similar_events(event->name, event->flags);
+
+		replot();
 	}
 }