diff --git a/core/modules/config_translation/config_translation.module b/core/modules/config_translation/config_translation.module
index 5971438..c209621 100644
--- a/core/modules/config_translation/config_translation.module
+++ b/core/modules/config_translation/config_translation.module
@@ -168,12 +168,14 @@ function config_translation_config_translation_type_info_alter(&$definitions) {
   // Enhance the text and date type definitions with classes to generate proper
   // form elements in ConfigTranslationFormBase. Other translatable types will
   // appear as a one line textfield.
-  foreach ($definitions as $type => $definition) {
-    if (isset($map[$definition['type']])) {
-      $definitions[$type]['form_element_class'] = $map[$definition['type']];
-    }
-    if (isset($definition['translatable']) && ($definition['translatable'] == TRUE) && !isset($definitions[$type]['form_element_class'])) {
-      $definitions[$type]['form_element_class'] = '\Drupal\config_translation\FormElement\Textfield';
+  foreach ($definitions as $type => &$definition) {
+    if (!isset($definition['form_element_class'])) {
+      if (isset($map[$definition['type']])) {
+        $definition['form_element_class'] = $map[$definition['type']];
+      }
+      elseif (!empty($definition['translatable'])) {
+        $definition['form_element_class'] = '\Drupal\config_translation\FormElement\Textfield';
+      }
     }
   }
 }
diff --git a/core/modules/config_translation/tests/modules/config_translation_test/config_translation_test.config_translation.yml b/core/modules/config_translation/tests/modules/config_translation_test/config_translation_test.config_translation.yml
index 86ce7e0..070245c 100644
--- a/core/modules/config_translation/tests/modules/config_translation_test/config_translation_test.config_translation.yml
+++ b/core/modules/config_translation/tests/modules/config_translation_test/config_translation_test.config_translation.yml
@@ -1,3 +1,4 @@
+# Attach to file settings for testing. The base route does not matter.
 system.file_system_settings:
   title: 'Test config translation'
   base_route_name: system.file_system_settings
diff --git a/core/modules/config_translation/tests/themes/config_translation_test_theme/config_translation_test_theme.config_translation.yml b/core/modules/config_translation/tests/themes/config_translation_test_theme/config_translation_test_theme.config_translation.yml
index 7c8cdd8..5d84070 100644
--- a/core/modules/config_translation/tests/themes/config_translation_test_theme/config_translation_test_theme.config_translation.yml
+++ b/core/modules/config_translation/tests/themes/config_translation_test_theme/config_translation_test_theme.config_translation.yml
@@ -1,3 +1,4 @@
+# Attach to performance settings for testing. The base route does not matter.
 system.performance_settings:
   title: 'Theme translation test'
   base_route_name: system.performance_settings