diff --git a/source/UI/js/Form/Input.js b/source/UI/js/Form/Input.js
index 3af912be..3708a913 100644
--- a/source/UI/js/Form/Input.js
+++ b/source/UI/js/Form/Input.js
@@ -431,8 +431,11 @@ Ox.Input = function(options, self) {
                 value;
 
             if (values[0]) {
-                if (self.options.autocompleteReplace) {
+                if (self.options.autocompleteReplace &&
+                        Ox.startsWith(values[0].toLowerCase(),
+                            self.options.value.toLowerCase())) {
                     newValue = values[0];
+                    selected = 0;
                 } else {
                     newValue = self.options.value;
                 }
@@ -456,7 +459,6 @@ Ox.Input = function(options, self) {
                 } else {
                     cursor(pos);
                 }
-                selected = 0;
             }
 
             if (self.options.autocompleteSelect) {