diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4208a37a..3772b219 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,10 +4,17 @@
 
 ## [Unreleased]
 
+## [2.1.0-beta.4] - 2022-12-30
+
+### Changed
+- Code completion trigger improvements ([support#894]).
+
 ### Fixed
 - Fixed terminal layout issues when resizing window vertically.
 - Fixed editor find widget visible over modal dialogs.
 
+[support#894]: https://github.com/pybricks/support/issues/894
+
 ## [2.1.0-beta.3] - 2022-12-28
 
 ### Changed
@@ -670,7 +677,8 @@ Prerelease changes are documented at [support#48].
 
 <!-- links for version headings -->
 
-[Unreleased]: https://github.com/pybricks/pybricks-code/compare/v2.1.0-beta.3...HEAD
+[Unreleased]: https://github.com/pybricks/pybricks-code/compare/v2.1.0-beta.4...HEAD
+[2.1.0-beta.4]: https://github.com/pybricks/pybricks-code/compare/v2.1.0-beta.3...v2.1.0-beta.4
 [2.1.0-beta.3]: https://github.com/pybricks/pybricks-code/compare/v2.1.0-beta.2...v2.1.0-beta.3
 [2.1.0-beta.2]: https://github.com/pybricks/pybricks-code/compare/v2.1.0-beta.1...v2.1.0-beta.2
 [2.1.0-beta.1]: https://github.com/pybricks/pybricks-code/compare/v2.0.1...v2.1.0-beta.1
diff --git a/package.json b/package.json
index 5bbebf48..ac080339 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@pybricks/pybricks-code",
-    "version": "2.1.0-beta.3",
+    "version": "2.1.0-beta.4",
     "license": "MIT",
     "author": "The Pybricks Authors",
     "repository": {
diff --git a/src/editor/sagas.ts b/src/editor/sagas.ts
index 9b93eb61..0fc37c71 100644
--- a/src/editor/sagas.ts
+++ b/src/editor/sagas.ts
@@ -606,7 +606,7 @@ function* runJedi(): Generator {
             const subscription = monaco.languages.registerCompletionItemProvider(
                 pybricksMicroPythonId,
                 {
-                    triggerCharacters: ['.', ' '],
+                    triggerCharacters: ['.'],
                     provideCompletionItems(
                         model,
                         position,
@@ -635,8 +635,8 @@ function* runJedi(): Generator {
             const subscription = monaco.languages.registerSignatureHelpProvider(
                 pybricksMicroPythonId,
                 {
-                    signatureHelpTriggerCharacters: ['('],
-                    signatureHelpRetriggerCharacters: [','],
+                    signatureHelpTriggerCharacters: ['(', ','],
+                    signatureHelpRetriggerCharacters: [')'],
                     provideSignatureHelp(model, position, token, context) {
                         return new Promise((resolve) => {
                             emit({ model, position, token, context, resolve });