diff --git a/modules/cart/js/commerce_cart.form.js b/modules/cart/js/commerce_cart.form.js
index 91c56640..c64cec77 100644
--- a/modules/cart/js/commerce_cart.form.js
+++ b/modules/cart/js/commerce_cart.form.js
@@ -9,7 +9,7 @@
   Drupal.behaviors.commerceCartForm = {
     attach: function (context) {
       // Trigger the "Update" button when Enter is pressed in a quantity field.
-      $('form .views-field-edit-quantity input.form-number', context)
+      $('.quantity-edit-input', context)
         .once('commerce-cart-edit-quantity')
         .keydown(function (event) {
           if (event.keyCode === 13) {
diff --git a/modules/cart/src/Plugin/views/field/EditQuantity.php b/modules/cart/src/Plugin/views/field/EditQuantity.php
index 84e2480b..2e160c2f 100644
--- a/modules/cart/src/Plugin/views/field/EditQuantity.php
+++ b/modules/cart/src/Plugin/views/field/EditQuantity.php
@@ -162,6 +162,11 @@ class EditQuantity extends FieldPluginBase {
           '#max' => 9999,
           '#step' => $step,
           '#required' => TRUE,
+          '#attributes' => [
+            'class' => [
+              'quantity-edit-input',
+            ],
+          ],
         ];
       }
       else {
