diff --git a/core/modules/color/lib/Drupal/color/Tests/ColorTest.php b/core/modules/color/lib/Drupal/color/Tests/ColorTest.php
index 6238019b33f..79462bee904 100644
--- a/core/modules/color/lib/Drupal/color/Tests/ColorTest.php
+++ b/core/modules/color/lib/Drupal/color/Tests/ColorTest.php
@@ -118,6 +118,7 @@ class ColorTest extends WebTestBase {
     $this->drupalLogin($this->big_user);
     $this->drupalGet($settings_path);
     $this->assertResponse(200);
+    $this->assertUniqueText('Color set');
     $edit['scheme'] = '';
     $edit[$test_values['palette_input']] = '#123456';
     $this->drupalPostForm($settings_path, $edit, t('Save configuration'));
diff --git a/core/modules/color/templates/color-scheme-form.html.twig b/core/modules/color/templates/color-scheme-form.html.twig
index 6cfacbd31e7..694c6f726af 100644
--- a/core/modules/color/templates/color-scheme-form.html.twig
+++ b/core/modules/color/templates/color-scheme-form.html.twig
@@ -20,7 +20,7 @@
   <div id="palette" class="clearfix">
     {{ form.palette }}
   </div>
-  {{ form }}
+  {{ form|without('scheme', 'palette') }}
   <h2>{{ 'Preview'|t }}</h2>
   {{ html_preview }}
 </div>