modules/javafx.controls/src/main/java/javafx/scene/control/skin/SpinnerSkin.java

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.  Oracle designates this

@@ -187,10 +187,13 @@
 
                 // Fix for the regression noted in a comment in RT-29885.
                 // This forwards the event down into the TextField when
                 // the key event is actually received by the Spinner.
                 textField.fireEvent(ke.copyFor(textField, textField));
+
+                if (ke.getCode() == KeyCode.ENTER) return;
+
                 ke.consume();
             }
         });
 
         // This event filter is to enable keyboard events being delivered to the