--- a/EditTextView.st	Sun Mar 12 21:55:11 2017 +0000
+++ b/EditTextView.st	Mon Mar 13 14:51:58 2017 +0000
@@ -7384,11 +7384,15 @@
 !
 
 paste
-    "Paste copybuffer (clipboard)"
-
-    self pasteOrReplace
-
-    "Modified: / 12-03-2017 / 21:46:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "paste the copybuffer; if there is a selection, unselect first.
+     Then paste at cursor position."
+
+    self checkModificationsAllowed ifTrue:[
+        self withSelfAndTextForPasteDo:[:me :text |
+            me unselect.
+            me undoablePaste:text
+        ]
+    ]
 !
 
 paste:someText