diff --git a/core/dive.c b/core/dive.c
index 2b3b7ef62..5ddaded9e 100644
--- a/core/dive.c
+++ b/core/dive.c
@@ -4189,11 +4189,10 @@ struct dive *make_first_dc(const struct dive *d, int dc_number)
 	return res;
 }
 
-/* always acts on the current dive */
-unsigned int count_divecomputers(void)
+int count_divecomputers(const struct dive *d)
 {
 	int ret = 1;
-	struct divecomputer *dc = current_dive->dc.next;
+	struct divecomputer *dc = d->dc.next;
 	while (dc) {
 		ret++;
 		dc = dc->next;
@@ -4229,7 +4228,7 @@ static void delete_divecomputer(struct dive *d, int num)
 
 	/* If this is the currently displayed dive, we might have to adjust
 	 * the currently displayed dive computer. */
-	if (d == current_dive && dc_number >= count_divecomputers())
+	if (d == current_dive && dc_number >= count_divecomputers(d))
 		dc_number--;
 	invalidate_dive_cache(d);
 }
diff --git a/core/dive.h b/core/dive.h
index 5efb24cca..2998ae9d6 100644
--- a/core/dive.h
+++ b/core/dive.h
@@ -435,7 +435,7 @@ extern struct divecomputer *get_dive_dc(struct dive *dive, int nr);
 extern timestamp_t dive_endtime(const struct dive *dive);
 
 extern struct dive *make_first_dc(const struct dive *d, int dc_number);
-extern unsigned int count_divecomputers(void);
+extern int count_divecomputers(const struct dive *d);
 extern struct dive *clone_delete_divecomputer(const struct dive *d, int dc_number);
 void split_divecomputer(const struct dive *src, int num, struct dive **out1, struct dive **out2);
 
diff --git a/profile-widget/profilewidget2.cpp b/profile-widget/profilewidget2.cpp
index c233b2b44..90c6e37ce 100644
--- a/profile-widget/profilewidget2.cpp
+++ b/profile-widget/profilewidget2.cpp
@@ -1430,13 +1430,13 @@ void ProfileWidget2::contextMenuEvent(QContextMenuEvent *event)
 			parentItem = parentItem->parentItem();
 		}
 		if (isDCName) {
-			if (dc_number == 0 && count_divecomputers() == 1)
+			if (dc_number == 0 && count_divecomputers(current_dive) == 1)
 				// nothing to do, can't delete or reorder
 				return;
 			// create menu to show when right clicking on dive computer name
 			if (dc_number > 0)
 				m.addAction(tr("Make first dive computer"), this, SLOT(makeFirstDC()));
-			if (count_divecomputers() > 1) {
+			if (count_divecomputers(current_dive) > 1) {
 				m.addAction(tr("Delete this dive computer"), this, SLOT(deleteCurrentDC()));
 				m.addAction(tr("Split this dive computer into own dive"), this, SLOT(splitCurrentDC()));
 			}