diff --git a/project/Build.scala b/project/Build.scala
index fbd2bfcb9ff4..17c49701ecde 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -1063,7 +1063,7 @@ object Build {
   lazy val `vscode-dotty` = project.in(file("vscode-dotty")).
     settings(commonSettings).
     settings(
-      version := "0.1.16-snapshot", // Keep in sync with package.json
+      version := "0.1.17-snapshot", // Keep in sync with package.json
       autoScalaLibrary := false,
       publishArtifact := false,
       includeFilter in unmanagedSources := NothingFilter | "*.ts" | "**.json",
diff --git a/vscode-dotty/package-lock.json b/vscode-dotty/package-lock.json
index f5d145280186..22e232900f01 100644
--- a/vscode-dotty/package-lock.json
+++ b/vscode-dotty/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "dotty",
-  "version": "0.1.16-snapshot",
+  "version": "0.1.17-snapshot",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/vscode-dotty/package.json b/vscode-dotty/package.json
index cc2bcf284f40..cfe21954fa92 100644
--- a/vscode-dotty/package.json
+++ b/vscode-dotty/package.json
@@ -2,7 +2,7 @@
   "name": "dotty",
   "displayName": "Dotty Language Server",
   "description": "IDE integration for Dotty, the experimental Scala compiler",
-  "version": "0.1.16-snapshot",
+  "version": "0.1.17-snapshot",
   "license": "BSD-3-Clause",
   "publisher": "lampepfl",
   "repository": {
diff --git a/vscode-dotty/src/extension.ts b/vscode-dotty/src/extension.ts
index cbf4baad64ae..1ce5e52275f0 100644
--- a/vscode-dotty/src/extension.ts
+++ b/vscode-dotty/src/extension.ts
@@ -54,11 +54,14 @@ export function activate(context: ExtensionContext) {
   // package.json does not work)
   vscode.languages.setLanguageConfiguration("scala", {
     "indentationRules": {
-      // Auto-indent when pressing enter on a line matching this regexp
-      "increaseIndentPattern": /(((\b(then|else|do|catch|finally|yield|match|while|try|for|if|case)\b)|\bif\s*\(.*\)|=|=>|<-|=>>)\s*$)/,
-      // Auto-unindent disabled, because it doesn't work well with all
-      // indentation styles
-      "decreaseIndentPattern": /^.$/
+      // Auto-indent when pressing enter on a line matching this regexp, in details:
+      // 1. If they're not preceded by `end`, auto-indent after `while`, `for`, `match`, `try`, `if`
+      // 2. Auto-indent after `if ...` as long as it doesn't match `if ... then ...`
+      // 3. Auto-indent after `then`, `else`, `do`, `catch`, `finally`, `yield`, `case`, `=`, `=>`, `<-`, `=>>`x
+      "increaseIndentPattern":
+        /(((?<!\bend\b\s*?)\b(if|while|for|match|try))|(\bif\s+(?!.*?\bthen\b.*?$)[^\s]*?)|(\b(then|else|do|catch|finally|yield|case))|=|=>|<-|=>>)\s*?$/,
+      // Only auto-unindent completed `end` folowed by `while`, `for`, `match`, `try`, `if`
+      "decreaseIndentPattern": /(^\s*end\b\s*)\b(if|while|for|match|try)$/
     }
   })