diff -r 29f3e62800ef javafx-ui-controls/src/javafx/scene/control/TextInputControl.java
--- a/javafx-ui-controls/src/javafx/scene/control/TextInputControl.java	Wed Aug 31 09:12:31 2011 -0700
+++ b/javafx-ui-controls/src/javafx/scene/control/TextInputControl.java	Wed Aug 31 16:20:52 2011 -0700
@@ -819,26 +819,15 @@
             doNotAdjustCaret = false;
         } else {
             deselect();
-            if (start == end) {
-                // there was no selection
-                String prefix = pos > 0 ? content.get(0, pos) : "";
-                String suffix = pos < getLength() ? content.get(pos, getLength()) : "";
-                doNotAdjustCaret = true;
-                setText(prefix + replacement + suffix);
-                int p = dot + replacement.length();
-                selectRange(p, p);
-                doNotAdjustCaret = false;
-            } else {
-                // there was a selection
-                // remove the selection and replace with char
-                String prefix = start > 0 ? content.get(0, start) : "";
-                String suffix = end < getLength() ? content.get(end, getLength()) : "";
-                doNotAdjustCaret = true;
-                setText(prefix + replacement + suffix);
-                int p = start + replacement.length();
-                selectRange(p, p);
-                doNotAdjustCaret = false;
-            }
+            // RT-16566: Need to take into account stripping of chars into caret pos
+            doNotAdjustCaret = true;
+            if (start != end) deleteText(start, end < getLength() ? end : getLength());
+            final int oldLength = getLength();
+            getContent().insert(start, replacement);
+            // RT-16566: Need to take into account stripping of chars into caret pos
+            final int p = start + getLength() - oldLength;
+            selectRange(p, p);
+            doNotAdjustCaret = false;
         }
     }
 
diff -r 29f3e62800ef javafx-ui-controls/test/javafx/scene/control/TextInputControlTest.java
--- a/javafx-ui-controls/test/javafx/scene/control/TextInputControlTest.java	Wed Aug 31 09:12:31 2011 -0700
+++ b/javafx-ui-controls/test/javafx/scene/control/TextInputControlTest.java	Wed Aug 31 16:20:52 2011 -0700
@@ -513,6 +513,40 @@
         assertEquals("The slow brown fox", textInput.getText());
     }
 
+    @Test public void pasteIllegalCharacters() {
+        textInput.setText("The quick brown fox");
+        textInput.selectRange(19, 19);
+        copy("" + '\0');
+        textInput.paste();
+        assertEquals("The quick brown fox", textInput.getText());
+    }
+
+    @Test public void pasteIllegalCharactersCaretNotAtZero() {
+        textInput.setText("The quick brown fox");
+        textInput.selectRange(4, 4);
+        copy("slow" + '\0');
+        textInput.paste();
+        assertEquals(8, textInput.getCaretPosition());
+        assertEquals(8, textInput.getAnchor());
+    }
+
+    @Test public void pasteIllegalCharactersSelection() {
+        textInput.setText("The quick brown fox");
+        textInput.selectRange(4, 9);
+        copy("slow" + '\0');
+        textInput.paste();
+        assertEquals("The slow brown fox", textInput.getText());
+    }
+
+    @Test public void pasteIllegalCharactersIntoSelectionPositionsCaretCorrectly() {
+        textInput.setText("The quick brown fox");
+        textInput.selectRange(4, 9);
+        copy("slow" + '\0');
+        textInput.paste();
+        assertEquals(8, textInput.getCaretPosition());
+        assertEquals(8, textInput.getAnchor());
+    }
+
     /******************************************************
      * Test for manipulating selection via methods        *
      *****************************************************/