diff --git a/escher/src/text_field.cpp b/escher/src/text_field.cpp
index f3ea207f9..51a250559 100644
--- a/escher/src/text_field.cpp
+++ b/escher/src/text_field.cpp
@@ -372,9 +372,11 @@ bool TextField::privateHandleEvent(Ion::Events::Event event) {
   if (event == Ion::Events::Copy || event == Ion::Events::Cut) {
     storeInClipboard();
     if (event == Ion::Events::Cut) {
-      reinitDraftTextBuffer();
-      resetSelection();
-      setEditing(true);
+      if (!m_contentView.selectionIsEmpty()) {
+        deleteSelection();
+      } else {
+        removeWholeText();
+      }
     }
     return true;
   }