diff --git a/src/Cursor.cpp b/src/Cursor.cpp
index 45ae34c4b2..b235200db9 100644
--- a/src/Cursor.cpp
+++ b/src/Cursor.cpp
@@ -903,7 +903,8 @@ void Cursor::pop()
 void Cursor::push(Inset & inset)
 {
 	push_back(CursorSlice(inset));
-	inset.setBuffer(*buffer());
+	// See bug #13050
+	// inset.setBuffer(*buffer());
 }
 
 
diff --git a/status.24x b/status.24x
index e982adeca2..b6304efe40 100644
--- a/status.24x
+++ b/status.24x
@@ -52,6 +52,8 @@ What's new
 - Fix bug where the dialog asking for saving unapplied changes on buffer change
   popped up twice, or sometimes not at all (bug 12954).
 
+- Improve performance when selecting text on less powerful systems (bug 13050).
+
 
 * INTERNALS