diff --git a/src/plugins/cmakeprojectmanager/cmakeautocompleter.cpp b/src/plugins/cmakeprojectmanager/cmakeautocompleter.cpp
index 6e5b482a70a..1f520a86bf5 100644
--- a/src/plugins/cmakeprojectmanager/cmakeautocompleter.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeautocompleter.cpp
@@ -89,7 +89,7 @@ QString CMakeAutoCompleter::insertMatchingQuote(const QTextCursor &cursor,
 int CMakeAutoCompleter::paragraphSeparatorAboutToBeInserted(QTextCursor &cursor)
 {
     const QString line = cursor.block().text().trimmed();
-    if (line.contains(QRegularExpression(QStringLiteral("^(endfunction|endmacro|endif|endforeach|endwhile)\\w*\\("))))
+    if (line.contains(QRegularExpression(QStringLiteral("^(endfunction|endmacro|endif|endforeach|endwhile|endblock)\\w*\\("))))
         tabSettings().indentLine(cursor.block(), tabSettings().indentationColumn(cursor.block().text()));
     return 0;
 }
diff --git a/src/plugins/cmakeprojectmanager/cmakeindenter.cpp b/src/plugins/cmakeprojectmanager/cmakeindenter.cpp
index 68157aea5bf..e3e88212c57 100644
--- a/src/plugins/cmakeprojectmanager/cmakeindenter.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeindenter.cpp
@@ -52,7 +52,8 @@ static bool lineStartsBlock(const QString &line)
             lineContainsFunction(line, QStringLiteral("while")) ||
             lineContainsFunction(line, QStringLiteral("if")) ||
             lineContainsFunction(line, QStringLiteral("elseif")) ||
-            lineContainsFunction(line, QStringLiteral("else"));
+            lineContainsFunction(line, QStringLiteral("else")) ||
+            lineContainsFunction(line, QStringLiteral("block"));
 }
 static bool lineEndsBlock(const QString &line)
 {
@@ -62,7 +63,8 @@ static bool lineEndsBlock(const QString &line)
             lineContainsFunction(line, QStringLiteral("endwhile")) ||
             lineContainsFunction(line, QStringLiteral("endif")) ||
             lineContainsFunction(line, QStringLiteral("elseif")) ||
-            lineContainsFunction(line, QStringLiteral("else"));
+            lineContainsFunction(line, QStringLiteral("else")) ||
+            lineContainsFunction(line, QStringLiteral("endblock"));
 }
 static bool lineIsEmpty(const QString &line)
 {