diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/DecimalFormatter.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/DecimalFormatter.php
index a53e0b9f6cb..ffbfe3515cc 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/DecimalFormatter.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/DecimalFormatter.php
@@ -52,11 +52,11 @@ class DecimalFormatter extends NumericFormatterBase {
       '#default_value' => $this->getSetting('decimal_separator'),
       '#weight' => 5,
     );
-    $range = range(0, 10);
     $elements['scale'] = array(
-      '#type' => 'select',
+      '#type' => 'number',
       '#title' => t('Scale', array(), array('context' => 'decimal places')),
-      '#options' => array_combine($range, $range),
+      '#min' => 0,
+      '#max' => 10,
       '#default_value' => $this->getSetting('scale'),
       '#description' => t('The number of digits to the right of the decimal.'),
       '#weight' => 6,
diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/DecimalItem.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/DecimalItem.php
index b898f8964f0..c8e608ecc2e 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/DecimalItem.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/DecimalItem.php
@@ -69,20 +69,21 @@ class DecimalItem extends NumericItemBase {
     $element = array();
     $settings = $this->getSettings();
 
-    $range = range(10, 32);
     $element['precision'] = array(
-      '#type' => 'select',
+      '#type' => 'number',
       '#title' => t('Precision'),
-      '#options' => array_combine($range, $range),
+      '#min' => 10,
+      '#max' => 32,
       '#default_value' => $settings['precision'],
       '#description' => t('The total number of digits to store in the database, including those to the right of the decimal.'),
       '#disabled' => $has_data,
     );
-    $range = range(0, 10);
+
     $element['scale'] = array(
-      '#type' => 'select',
+      '#type' => 'number',
       '#title' => t('Scale', array(), array('context' => 'decimal places')),
-      '#options' => array_combine($range, $range),
+      '#min' => 0,
+      '#max' => 10,
       '#default_value' => $settings['scale'],
       '#description' => t('The number of digits to the right of the decimal.'),
       '#disabled' => $has_data,