diff --git a/README.md b/README.md
index f5bd1c7a..e0a26f17 100644
--- a/README.md
+++ b/README.md
@@ -37,6 +37,7 @@ Xterm.js is used in several world-class applications to provide great terminal e
 - [**Terminal for Atom**](https://github.com/jsmecham/atom-terminal-tab): A simple terminal for the Atom text editor.
 - [**Eclipse Orion**](https://orionhub.org): A modern, open source software development environment that runs in the cloud. Code, deploy and run in the cloud.
 - [**Gravitational Teleport**](https://github.com/gravitational/teleport): Gravitational Teleport is a modern SSH server for remotely accessing clusters of Linux servers via SSH or HTTPS.
+- [**Hexlet**](https://en.hexlet.io): Practical programming courses (JavaScript, PHP, Unix, databases, functional programming). A steady path from the first line of code to the first job. 
 
 Do you use xterm.js in your application as well? Please [open a Pull Request](https://github.com/sourcelair/xterm.js/pulls) to include it here. We would love to have it in our list.
 
diff --git a/src/SelectionManager.ts b/src/SelectionManager.ts
index 1e501e93..cbcbf34d 100644
--- a/src/SelectionManager.ts
+++ b/src/SelectionManager.ts
@@ -178,6 +178,7 @@ export class SelectionManager extends EventEmitter {
    */
   public setBuffer(buffer: CircularList<any>): void {
     this._buffer = buffer;
+    this.clearSelection();
   }
 
   /**