diff --git a/forms/Form.php b/forms/Form.php
index 63606ea04..b02a02af8 100644
--- a/forms/Form.php
+++ b/forms/Form.php
@@ -379,10 +379,9 @@ class Form extends RequestHandler {
 				if($field = $this->checkFieldsForAction($field->FieldList(), $funcName)) {
 					return $field;
 				}
-			} elseif (!$field->hasMethod($funcName)) {
-				continue;
+			} elseif ($field->hasMethod($funcName)) {
+				return $field;
 			}
-			return $field;
 		}
 	}