--- a/EditTextView.st	Tue Jul 28 17:31:58 2015 +0100
+++ b/EditTextView.st	Thu Jul 30 06:49:25 2015 +0200
@@ -5160,8 +5160,8 @@
     ].
 
     (key == #Accept)  ifTrue:[^ self accept].
-
-    ((key == #Paste) or:[key == #Insert or:[key == #PasteFromHistory]]) ifTrue:[self pasteOrReplace. ^self].
+    (key == #PasteFromHistory) ifTrue:[self pasteOrReplaceFromHistory. ^self].
+    (key == #Paste or:[key == #Insert]) ifTrue:[self pasteOrReplaceByKeyPress. ^self].
     (key == #Cut) ifTrue:[self cut. ^self].
     (key == #Again) ifTrue:[self again. ^self].
     (key == #AgainForAll) ifTrue:[self multipleAgain. ^self].
@@ -6951,6 +6951,22 @@
     "Modified: / 30.1.2000 / 02:33:00 / cg"
 !
 
+pasteOrReplaceByKeyPress
+    "paste a previous item from the copybuffer history.
+     (i.e. repaste some previously deleted or copied text)"
+
+    |text|
+
+    self checkModificationsAllowed ifFalse:[
+        self flashReadOnly.
+        ^ self
+    ].
+    text := self getClipboardText:#clipboard.
+    text notNil ifTrue:[
+        self pasteOrReplace:text
+    ]
+!
+
 pasteOrReplaceFromHistory
     "paste a previous item from the copybuffer history.
      (i.e. repaste some previously deleted or copied text)"