diff --git a/qt-ui/divelistview.cpp b/qt-ui/divelistview.cpp
index 5fde4c45f..442ea1fb7 100644
--- a/qt-ui/divelistview.cpp
+++ b/qt-ui/divelistview.cpp
@@ -156,7 +156,9 @@ void DiveListView::restoreSelection()
 		return;
 
 	selectionSaved = false;
+	dontEmitDiveChangedSignal = true;
 	unselectDives();
+	dontEmitDiveChangedSignal = false;
 	Q_FOREACH (dive_trip_t *trip, selectedDives.keys()) {
 		QList<int> divesOnTrip = getDivesInTrip(trip);
 		QList<int> selectedDivesOnTrip = selectedDives.values(trip);
diff --git a/qt-ui/maintab.cpp b/qt-ui/maintab.cpp
index 87d2a1beb..95143ed11 100644
--- a/qt-ui/maintab.cpp
+++ b/qt-ui/maintab.cpp
@@ -761,10 +761,9 @@ void MainTab::acceptChanges()
 		editMode = NONE;
 		MainWindow::instance()->dive_list()->rememberSelection();
 		sort_table(&dive_table);
-		MainWindow::instance()->refreshDisplay();
+		MainWindow::instance()->refreshDisplay(false);
 		MainWindow::instance()->dive_list()->restoreSelection();
 	}
-	updateDiveInfo();
 	DivePlannerPointsModel::instance()->setPlanMode(DivePlannerPointsModel::NOTHING);
 	MainWindow::instance()->dive_list()->verticalScrollBar()->setSliderPosition(scrolledBy);
 	MainWindow::instance()->dive_list()->setFocus();