diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditorBase.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditorBase.java
index 06875cf0a328b90be5cfed9960cc54701d1bae2f..5eabe6552e79b775e77e6a639753357e12d4297c 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditorBase.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditorBase.java
@@ -597,7 +597,9 @@ public abstract class SQLEditorBase extends BaseTextEditor {
             if (token instanceof SQLBlockBeginToken) {
                 bracketDepth++;
                 hasBlocks = true;
-            } else if (token instanceof SQLBlockEndToken) {
+            } else if (bracketDepth > 0 && token instanceof SQLBlockEndToken) {
+                // Sometimes query contains END clause without BEGIN. E.g. CASE, IF, etc.
+                // This END doesn't mean block
                 bracketDepth--;
                 hasBlocks = true;
             } else if (isDelimiter && bracketDepth > 0) {