diff --git a/package.json b/package.json
index 0576eef70..f96122ff1 100644
--- a/package.json
+++ b/package.json
@@ -90,6 +90,7 @@
   },
   "dependencies": {
     "@types/promise-retry": "^1.1.3",
+    "@types/react-color": "^3.0.1",
     "@types/react-transition-group": "^4.2.2",
     "@types/redux-devtools-extension": "^2.13.2",
     "@types/rsocket-tcp-server": "^0.0.2",
diff --git a/src/ui/components/data-inspector/DataDescription.tsx b/src/ui/components/data-inspector/DataDescription.tsx
index ed1c7f1b1..a2496436d 100644
--- a/src/ui/components/data-inspector/DataDescription.tsx
+++ b/src/ui/components/data-inspector/DataDescription.tsx
@@ -341,7 +341,21 @@ class ColorEditor extends Component<{
               colors.pink,
               colors.grape,
             ]}
-            onChange={this.onChange}
+            onChange={(color: {
+              hex: string;
+              hsl: {
+                a?: number;
+                h: number;
+                l: number;
+                s: number;
+              };
+              rgb: {a?: number; b: number; g: number; r: number};
+            }) => {
+              this.onChange({
+                hex: color.hex,
+                rgb: {...color.rgb, a: color.rgb.a || 1},
+              });
+            }}
           />
         </Popover>
       </ColorPickerDescription>
@@ -432,7 +446,7 @@ function parseColor(
 
   // extract alpha if passed AARRGGBB
   if (val.length === 8) {
-    a = parseInt(parts.shift(), 16) / 255;
+    a = parseInt(parts.shift() || '0', 16) / 255;
   }
 
   const size = val.length;
diff --git a/yarn.lock b/yarn.lock
index 1d396e95f..18415cf0d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1182,6 +1182,13 @@
   resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.1.tgz#f1a11e7babb0c3cad68100be381d1e064c68f1f6"
   integrity sha512-CFzn9idOEpHrgdw8JsoTkaDDyRWk1jrzIV8djzcgpq0y9tG4B4lFT+Nxh52DVpDXV+n4+NPNv7M1Dj5uMp6XFg==
 
+"@types/react-color@^3.0.1":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@types/react-color/-/react-color-3.0.1.tgz#5433e2f503ea0e0831cbc6fd0c20f8157d93add0"
+  integrity sha512-J6mYm43Sid9y+OjZ7NDfJ2VVkeeuTPNVImNFITgQNXodHteKfl/t/5pAR5Z9buodZ2tCctsZjgiMlQOpfntakw==
+  dependencies:
+    "@types/react" "*"
+
 "@types/react-dom@^16.8.5":
   version "16.8.5"
   resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.8.5.tgz#3e3f4d99199391a7fb40aa3a155c8dd99b899cbd"