diff --git a/src/plugins/clangtools/clangtoolsdiagnosticview.cpp b/src/plugins/clangtools/clangtoolsdiagnosticview.cpp
index ca421e5c825..689886d3f26 100644
--- a/src/plugins/clangtools/clangtoolsdiagnosticview.cpp
+++ b/src/plugins/clangtools/clangtoolsdiagnosticview.cpp
@@ -232,12 +232,14 @@ void DiagnosticView::goNext()
 {
     const QModelIndex currentIndex = selectionModel()->currentIndex();
     selectIndex(getIndex(currentIndex, Next));
+    openEditorForCurrentIndex();
 }
 
 void DiagnosticView::goBack()
 {
     const QModelIndex currentIndex = selectionModel()->currentIndex();
     selectIndex(getIndex(currentIndex, Previous));
+    openEditorForCurrentIndex();
 }
 
 QModelIndex DiagnosticView::getIndex(const QModelIndex &index, Direction direction) const