diff --git a/src/plugins/git/gitsubmiteditorwidget.cpp b/src/plugins/git/gitsubmiteditorwidget.cpp
index 26d0d7f526e..e00d20d7ed3 100644
--- a/src/plugins/git/gitsubmiteditorwidget.cpp
+++ b/src/plugins/git/gitsubmiteditorwidget.cpp
@@ -88,6 +88,7 @@ void GitSubmitHighlighter::highlightBlock(const QString &text)
         return;
     } else if (text.startsWith(m_hashChar)) {
         setFormat(0, text.size(), m_commentFormat);
+        setCurrentBlockState(state);
         return;
     } else if (state == None) {
         state = Header;