diff --git a/lib/ui/app/forms/color_picker.dart b/lib/ui/app/forms/color_picker.dart
index 723eb25d9..16f0bf942 100644
--- a/lib/ui/app/forms/color_picker.dart
+++ b/lib/ui/app/forms/color_picker.dart
@@ -95,22 +95,33 @@ class _FormColorPickerState extends State<FormColorPicker> {
             labelText: widget.labelText,
           ),
         ),
-        if (_selectedColor == null)
-          IconButton(
-            icon: Icon(Icons.color_lens),
-            onPressed: _showPicker,
-          ),
-        if (_selectedColor != null)
-          IconButton(
-            icon: Icon(Icons.clear),
-            onPressed: () {
-              _textController.text = '';
-              setState(() {
-                _selectedColor = null;
-              });
-              widget.onSelected(null);
-            },
-          ),
+        Row(
+          mainAxisAlignment: MainAxisAlignment.end,
+          children: <Widget>[
+            Container(
+              color: convertHexStringToColor(widget.initialValue),
+              width: 100,
+              height: 20,
+            ),
+            SizedBox(width: 20),
+            if (_selectedColor == null)
+              IconButton(
+                icon: Icon(Icons.color_lens),
+                onPressed: _showPicker,
+              )
+            else
+              IconButton(
+                icon: Icon(Icons.clear),
+                onPressed: () {
+                  _textController.text = '';
+                  setState(() {
+                    _selectedColor = null;
+                  });
+                  widget.onSelected(null);
+                },
+              ),
+          ],
+        ),
       ],
     );
   }