diff --git a/CHANGELOG.md b/CHANGELOG.md
index 17325cc..0254917 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 6.26.2 (2024-04-09)
+
+### Bug fixes
+
+Improve behavior of `scrollPastEnd` in a scaled editor.
+
+When available, use `Selection.getComposedRanges` on Safari to find the selection inside a shadow DOM.
+
+Remove the workaround that avoided inappropriate styling on composed text after a decoration again, since it breaks the stock Android virtual keyboard.
+
 ## 6.26.1 (2024-03-28)
 
 ### Bug fixes
diff --git a/package.json b/package.json
index 0fe5209..f98338b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@codemirror/view",
-  "version": "6.26.1",
+  "version": "6.26.2",
   "description": "DOM view component for the CodeMirror code editor",
   "scripts": {
     "test": "cm-runtests",