diff --git a/src/plugins/valgrind/memcheckerrorview.cpp b/src/plugins/valgrind/memcheckerrorview.cpp
index 69957dd6be3..af5f8026c12 100644
--- a/src/plugins/valgrind/memcheckerrorview.cpp
+++ b/src/plugins/valgrind/memcheckerrorview.cpp
@@ -509,11 +509,13 @@ void MemcheckErrorView::suppressError()
 
 void MemcheckErrorView::goNext()
 {
+    QTC_ASSERT(rowCount(), return);
     setCurrentRow((currentRow() + 1) % rowCount());
 }
 
 void MemcheckErrorView::goBack()
 {
+    QTC_ASSERT(rowCount(), return);
     const int prevRow = currentRow() - 1;
     setCurrentRow(prevRow >= 0 ? prevRow : rowCount() - 1);
 }
diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp
index 9c2e89a8174..db2991acae2 100644
--- a/src/plugins/valgrind/memchecktool.cpp
+++ b/src/plugins/valgrind/memchecktool.cpp
@@ -544,8 +544,8 @@ void MemcheckTool::updateErrorFilter()
 void MemcheckTool::finished()
 {
     const int n = m_errorModel->rowCount();
-    m_goBack->setEnabled(n > 0);
-    m_goNext->setEnabled(n > 0);
+    m_goBack->setEnabled(n > 1);
+    m_goNext->setEnabled(n > 1);
     const QString msg = AnalyzerManager::msgToolFinished(displayName(), n);
     AnalyzerManager::showStatusMessage(msg);
 }