diff --git a/AppKit/CPTextField.j b/AppKit/CPTextField.j
index 9eebc0b87..2adfdbe70 100644
--- a/AppKit/CPTextField.j
+++ b/AppKit/CPTextField.j
@@ -1099,8 +1099,15 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 
 - (void)deleteBackward:(id)sender
 {
-    var selectedRange = [self selectedRange],
-        stringValue = [self stringValue],
+    var selectedRange = [self selectedRange];
+
+    if (selectedRange.length < 2)
+         return;
+
+    selectedRange.location += 1;
+    selectedRange.length -= 1;
+    
+    var stringValue = [self stringValue],
         newValue = [stringValue stringByReplacingCharactersInRange:selectedRange withString:""];
 
     [self setStringValue:newValue];