diff --git a/lib/capybara/cuprite/javascripts/index.js b/lib/capybara/cuprite/javascripts/index.js
index 74b96ae5..c193d492 100644
--- a/lib/capybara/cuprite/javascripts/index.js
+++ b/lib/capybara/cuprite/javascripts/index.js
@@ -153,7 +153,7 @@ class Cuprite {
 
     let valueBefore = node.value;
 
-    this.trigger(node, "focus");
+    node.focus();
     this.setValue(node, "");
 
     if (node.type == "number" || node.type == "date" || node.type == "range") {
diff --git a/spec/features/driver_spec.rb b/spec/features/driver_spec.rb
index 4896324c..466310b4 100644
--- a/spec/features/driver_spec.rb
+++ b/spec/features/driver_spec.rb
@@ -1533,7 +1533,7 @@ def create_screenshot(file, *args)
         it "fills a date" do
           @session.fill_in "date_field", with: "2016-02-14"
 
-          expect(@session.find(:css, "#date_field").value).to eq("2016-02-14")
+          expect(@session.find(:css, "#date_field", focused: true).value).to eq("2016-02-14")
         end
       end