diff --git a/src/Resources/views/Form/form_validate.js.twig b/src/Resources/views/Form/form_validate.js.twig
index e2c6edc..fa0297d 100644
--- a/src/Resources/views/Form/form_validate.js.twig
+++ b/src/Resources/views/Form/form_validate.js.twig
@@ -22,7 +22,7 @@
             form.find("*[name=\"{{ button.name|e('js') }}\"]").addClass("cancel");
         {%- elseif enforce_validation_groups -%}
             form.find("*[name=\"{{ button.name|e('js') }}\"]").click(function() {
-                validator.settings.validation_groups = { {{- gen.validation_groups(validation_groups, button.validation_groups) -}} };
+                validator.settings.validation_groups = { {{- gen.validation_groups(validation_groups, enabled_validation_groups) -}} };
             });
         {%- endif -%}
     {%- endfor %}
diff --git a/src/Twig/JqueryValidationExtension.php b/src/Twig/JqueryValidationExtension.php
index 7f3b3e7..def23c4 100644
--- a/src/Twig/JqueryValidationExtension.php
+++ b/src/Twig/JqueryValidationExtension.php
@@ -58,7 +58,7 @@ public function renderJavascript(\Twig_Environment $twig, FormView $view)
             'validation_groups' => $this->validationGroupsViewData($rootContext),
         );
         $templateVars['enforce_validation_groups'] = count($templateVars['validation_groups']) > 1;
-        $templateVars['enabled_validation_groups'] = count($rootContext->getButtons()) === 0 ? $templateVars['validation_groups'] : array();
+        $templateVars['enabled_validation_groups'] = $templateVars['validation_groups'];
 
         // Only add buttons from the root form
         if ($view->parent === null) {