diff --git a/src/text-editor-component.js b/src/text-editor-component.js
index fff4fd224..c879816f4 100644
--- a/src/text-editor-component.js
+++ b/src/text-editor-component.js
@@ -1673,7 +1673,7 @@ module.exports = class TextEditorComponent {
       this.scheduleUpdate();
     }
 
-    this.getHiddenInput().focus();
+    this.getHiddenInput().focus({preventScroll:true});
   }
 
   // Called by TextEditorElement so that this function is always the first
@@ -1932,7 +1932,7 @@ module.exports = class TextEditorComponent {
         // Disabling the hidden input makes it lose focus as well, so we have to
         // re-enable and re-focus it.
         this.getHiddenInput().disabled = false;
-        this.getHiddenInput().focus();
+        this.getHiddenInput().focus({preventScroll:true});
       });
       return;
     }