diff --git a/.pnp.cjs b/.pnp.cjs
index 265dce6..09dd5f9 100755
--- a/.pnp.cjs
+++ b/.pnp.cjs
@@ -5495,7 +5495,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
             ["autoprefixer", "virtual:f75ee15f791266b2a9e7ffe35ac1678a30fd9c9040d7c1009869bf9b007be6d372c7549d53f3c2ea1196c0ed1eab2f69c3bf7fb7575d8a4977196383d0e2fa7c#npm:10.4.8"],\
             ["@types/postcss", null],\
             ["browserslist", "npm:4.21.3"],\
-            ["caniuse-lite", "npm:1.0.30001374"],\
+            ["caniuse-lite", "npm:1.0.30001482"],\
             ["fraction.js", "npm:4.2.0"],\
             ["normalize-range", "npm:0.1.2"],\
             ["picocolors", "npm:1.0.0"],\
@@ -5990,7 +5990,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "packageLocation": "./.yarn/cache/browserslist-npm-4.14.0-067b74568f-d8e3e8acf3.zip/node_modules/browserslist/",\
           "packageDependencies": [\
             ["browserslist", "npm:4.14.0"],\
-            ["caniuse-lite", "npm:1.0.30001374"],\
+            ["caniuse-lite", "npm:1.0.30001482"],\
             ["electron-to-chromium", "npm:1.3.556"],\
             ["escalade", "npm:3.0.2"],\
             ["node-releases", "npm:1.1.60"]\
@@ -6001,7 +6001,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "packageLocation": "./.yarn/cache/browserslist-npm-4.21.3-7dabe86a57-ff512a7bcc.zip/node_modules/browserslist/",\
           "packageDependencies": [\
             ["browserslist", "npm:4.21.3"],\
-            ["caniuse-lite", "npm:1.0.30001374"],\
+            ["caniuse-lite", "npm:1.0.30001482"],\
             ["electron-to-chromium", "npm:1.4.211"],\
             ["node-releases", "npm:2.0.6"],\
             ["update-browserslist-db", "virtual:7dabe86a57e66f38602a3318a9a679c09cef5315077ee4afa3dbf7e16ac6eadfd7834360e07fea78c56290801aa035a0803a3e03041c77287c222df384f2a179#npm:1.0.5"]\
@@ -6142,7 +6142,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
           "packageDependencies": [\
             ["caniuse-api", "npm:3.0.0"],\
             ["browserslist", "npm:4.14.0"],\
-            ["caniuse-lite", "npm:1.0.30001374"],\
+            ["caniuse-lite", "npm:1.0.30001482"],\
             ["lodash.memoize", "npm:4.1.2"],\
             ["lodash.uniq", "npm:4.5.0"]\
           ],\
@@ -6150,10 +6150,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
         }]\
       ]],\
       ["caniuse-lite", [\
-        ["npm:1.0.30001374", {\
-          "packageLocation": "./.yarn/cache/caniuse-lite-npm-1.0.30001374-c65a34c0b3-a75656e971.zip/node_modules/caniuse-lite/",\
+        ["npm:1.0.30001482", {\
+          "packageLocation": "./.yarn/cache/caniuse-lite-npm-1.0.30001482-266bfb6271-a5f7681c86.zip/node_modules/caniuse-lite/",\
           "packageDependencies": [\
-            ["caniuse-lite", "npm:1.0.30001374"]\
+            ["caniuse-lite", "npm:1.0.30001482"]\
           ],\
           "linkType": "HARD"\
         }]\
diff --git a/.yarn/cache/caniuse-lite-npm-1.0.30001374-c65a34c0b3-a75656e971.zip b/.yarn/cache/caniuse-lite-npm-1.0.30001374-c65a34c0b3-a75656e971.zip
deleted file mode 100644
index 89a32a3..0000000
Binary files a/.yarn/cache/caniuse-lite-npm-1.0.30001374-c65a34c0b3-a75656e971.zip and /dev/null differ
diff --git a/src/Common.js b/src/Common.js
index 0da0a86..3e5d37e 100644
--- a/src/Common.js
+++ b/src/Common.js
@@ -362,9 +362,16 @@ export class SafeTextarea extends Component {
 
   set(text) {
     this.change_callback(text);
-    this.setState({
-      text: text,
-    });
+    let currPos = this.area_ref.current.selectionStart;
+    this.setState(
+      {
+        text: text,
+      },
+      () => {
+        this.area_ref.current.setSelectionRange(currPos, currPos);
+        this.area_ref.current.focus();
+      },
+    );
   }
 
   get() {
diff --git a/yarn.lock b/yarn.lock
index 6520904..c318feb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4037,9 +4037,9 @@ __metadata:
   linkType: hard
 
 "caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001111, caniuse-lite@npm:^1.0.30001370, caniuse-lite@npm:^1.0.30001373":
-  version: 1.0.30001374
-  resolution: "caniuse-lite@npm:1.0.30001374"
-  checksum: a75656e971d7ef2af4d2f3529a4620ae1a45d09460601fbc34b26f6867f31bbca006f71d8840291c471a2f01fc1994044f319a5660241ffaf35a2d84535af442
+  version: 1.0.30001482
+  resolution: "caniuse-lite@npm:1.0.30001482"
+  checksum: a5f7681c860a29736f29350ebd81041c40b6aa7b2f94c50ed27284a0507e46dc79536dcfc05432504cfc80a0bf2070e4ad6fa704a9c0f3f32d47bed9059e98c2
   languageName: node
   linkType: hard