diff --git a/src/Forms/Container.php b/src/Forms/Container.php
index db6f5871d..16e7a529d 100644
--- a/src/Forms/Container.php
+++ b/src/Forms/Container.php
@@ -522,6 +522,19 @@ public function addMultiSelect(
 	}
 
 
+	/**
+	 * Adds color picker.
+	 * @param  string|object|null  $label
+	 */
+	public function addColor(string $name, $label = null): Controls\TextInput
+	{
+		return $this[$name] = (new Controls\TextInput($label))
+			->setNullable()
+			->setHtmlType('color')
+			->addRule(Form::Pattern, 'Invalid color', '#[0-9a-fA-F]{6}');
+	}
+
+
 	/**
 	 * Adds button used to submit form.
 	 * @param  string|object|null  $caption
diff --git a/tests/Forms/Controls.TextInput.color.phpt b/tests/Forms/Controls.TextInput.color.phpt
new file mode 100644
index 000000000..4770d09cd
--- /dev/null
+++ b/tests/Forms/Controls.TextInput.color.phpt
@@ -0,0 +1,54 @@
+<?php
+
+/**
+ * Test: Nette\Forms\Controls\TextInput & color.
+ */
+
+declare(strict_types=1);
+
+use Nette\Forms\Form;
+use Nette\Utils\Html;
+use Tester\Assert;
+
+require __DIR__ . '/../bootstrap.php';
+
+
+before(function () {
+	$_SERVER['REQUEST_METHOD'] = 'POST';
+	$_POST = $_FILES = [];
+	$_COOKIE[Nette\Http\Helpers::STRICT_COOKIE_NAME] = '1';
+	Form::initialize(true);
+});
+
+
+test('loadData empty string', function () {
+	$_POST = ['color' => ''];
+
+	$form = new Form;
+	$input = $form->addColor('color');
+
+	Assert::null($input->getValue());
+	Assert::false($input->isFilled());
+});
+
+
+test('loadData valid string', function () {
+	$_POST = ['color' => '#1020aa'];
+
+	$form = new Form;
+	$input = $form->addColor('color');
+
+	Assert::same('#1020aa', $input->getValue());
+	Assert::true($input->isFilled());
+});
+
+
+
+test('', function () {
+	$form = new Form;
+	$input = $form->addColor('color')
+		->setValue('#1020AB');
+
+	Assert::type(Html::class, $input->getControl());
+	Assert::same('<input type="color" name="color" id="frm-color" data-nette-rules=\'[{"op":":pattern","msg":"Invalid color","arg":"#[0-9a-fA-F]{6}"}]\' value="#1020AB">', (string) $input->getControl());
+});