diff --git a/core/java/android/widget/EditText.java b/core/java/android/widget/EditText.java
index d661bc68ab06b..2c612804d7183 100644
--- a/core/java/android/widget/EditText.java
+++ b/core/java/android/widget/EditText.java
@@ -110,7 +110,7 @@ public class EditText extends TextView {
             return null;
         }
         if (text instanceof Editable) {
-            return (Editable) super.getText();
+            return (Editable) text;
         }
         super.setText(text, BufferType.EDITABLE);
         return (Editable) super.getText();