diff --git a/lib/zombie/browser.coffee b/lib/zombie/browser.coffee
index cb56fc6e7..ee1d0d7df 100644
--- a/lib/zombie/browser.coffee
+++ b/lib/zombie/browser.coffee
@@ -685,9 +685,9 @@ class Browser extends EventEmitter
   button: (selector)->
     if button = @querySelector(selector)
       return button if button.tagName == "BUTTON" || button.tagName == "INPUT"
-    for button in @querySelectorAll("form button")
+    for button in @querySelectorAll("button")
       return button if button.textContent.trim() == selector
-    inputs = @querySelectorAll("form :submit, form :reset, form :button")
+    inputs = @querySelectorAll(":submit, :reset, :button")
     for input in inputs
       return input if input.name == selector
     for input in inputs
diff --git a/test/jquery_compat_test.coffee b/test/jquery_compat_test.coffee
index be3270073..c713101a8 100644
--- a/test/jquery_compat_test.coffee
+++ b/test/jquery_compat_test.coffee
@@ -29,6 +29,10 @@ test = (version)->
 
             <input id="edit-subject" value="subject">
             <textarea id="edit-note">note</textarea>
+
+            <form action="/zombie/dead-end">
+              <button class="some-class">Click Me</button>
+            </form>
           </body>
 
           <script>
@@ -98,6 +102,24 @@ test = (version)->
         assert !@browser.query("textarea#edit-note").textContent
 
 
+    # Using new event delegation introduced in 1.7
+    if version > "1.7"
+
+      describe "event handling", ->
+        it "should catch live event handler", (done)->
+          @browser.window.$(@browser.document).live "click", ".some-class", (event)->
+            done()
+          @browser.pressButton "Click Me"
+
+        it "should respect preventDefault in event delegation", (done)->
+          @browser.window.$(@browser.document).on "click", ".some-class", (event)->
+            event.preventDefault()
+            return
+          @browser.pressButton "Click Me", =>
+            assert @browser.location.pathname != "/zombie/dead-end"
+            done()
+
+
 describe "Compatibility with jQuery", ->
 
   for version in JQUERY_VERSIONS