diff --git a/commands/command_divelist.cpp b/commands/command_divelist.cpp
index 12e1c9309..1d1a90387 100644
--- a/commands/command_divelist.cpp
+++ b/commands/command_divelist.cpp
@@ -574,10 +574,7 @@ void DeleteDive::redoit()
 		timestamp_t when = divesToAdd.dives[0].dive->when;
 		newCurrent = find_next_visible_dive(when);
 	}
-	if (newCurrent)
-		setSelection(std::vector<dive *>{ newCurrent }, newCurrent);
-	else
-		setSelection(std::vector<dive *>(), nullptr);
+	select_single_dive(newCurrent);
 }
 
 
diff --git a/core/selection.cpp b/core/selection.cpp
index 6b5dfe726..7bddd86ee 100644
--- a/core/selection.cpp
+++ b/core/selection.cpp
@@ -195,6 +195,14 @@ void setSelection(const std::vector<dive *> &selection, dive *currentDive)
 	emit diveListNotifier.divesSelected(divesToSelect, current_dive);
 }
 
+extern "C" void select_single_dive(dive *d)
+{
+	if (d)
+		setSelection(std::vector<dive *>{ d }, d);
+	else
+		setSelection(std::vector<dive *>(), nullptr);
+}
+
 // Turn current selection into a vector.
 // TODO: This could be made much more efficient if we kept a sorted list of selected dives!
 std::vector<dive *> getDiveSelection()
@@ -217,9 +225,9 @@ extern "C" void select_newest_visible_dive()
 	for (int i = dive_table.nr - 1; i >= 0; --i) {
 		dive *d = dive_table.dives[i];
 		if (!d->hidden_by_filter)
-			return setSelection({ d }, d);
+			return select_single_dive(d);
 	}
 
 	// No visible dive -> deselect all
-	setSelection({}, nullptr);
+	select_single_dive(nullptr);
 }
diff --git a/core/selection.h b/core/selection.h
index a390f0dd7..8fe5707ce 100644
--- a/core/selection.h
+++ b/core/selection.h
@@ -20,6 +20,7 @@ extern struct dive *first_selected_dive(void);
 extern struct dive *last_selected_dive(void);
 extern bool consecutive_selected(void);
 extern void select_newest_visible_dive();
+extern void select_single_dive(struct dive *d); // wrapper for setSelection() with a single dive. NULL clears the selection.
 
 #if DEBUG_SELECTION_TRACKING
 extern void dump_selection(void);