diff --git a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/format/tokenized/SQLFormatterTokenized.java b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/format/tokenized/SQLFormatterTokenized.java
index b4b9b33e2adc9564f2b41dbcc803477719560261..934d7eb10f0ff4ad25540d30bd617036d216fada 100644
--- a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/format/tokenized/SQLFormatterTokenized.java
+++ b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/format/tokenized/SQLFormatterTokenized.java
@@ -220,8 +220,14 @@ public class SQLFormatterTokenized implements SQLFormatter {
                         case "DROP":
                         case "TRUNCATE":
                         case "TABLE":
+                            if (!isCompact) {
+                                indent++;
+                                index += insertReturnAndIndent(argList, index + 1, indent);
+                            }
+                            break;
                         case "CASE":  //$NON-NLS-1$
                             if (!isCompact) {
+                                index += insertReturnAndIndent(argList, index - 1, indent);
                                 indent++;
                                 index += insertReturnAndIndent(argList, index + 1, indent);
                             }