diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp
index 235360fe0ce1234e40c045b036d356ee5da94ae0..321ac4de2950385234e9ec114fd237f705be7ba4 100644
--- a/src/plugins/cppeditor/cppeditor.cpp
+++ b/src/plugins/cppeditor/cppeditor.cpp
@@ -2303,8 +2303,9 @@ bool CPPEditorWidget::handleDocumentationComment(QKeyEvent *e)
                     doxygen.setStyle(CppTools::DoxygenGenerator::JavaStyle);
 
                 // Move until we reach any possibly meaningful content.
-                while (document()->characterAt(cursor.position()).isSpace())
-                    cursor.movePosition(QTextCursor::NextCharacter);
+                while (document()->characterAt(cursor.position()).isSpace()
+                       && cursor.movePosition(QTextCursor::NextCharacter)) {
+                }
 
                 const QString &comment = doxygen.generate(cursor);
                 if (!comment.isEmpty()) {