diff --git a/packages/grafana-ui/src/components/ColorPicker/ColorInput.tsx b/packages/grafana-ui/src/components/ColorPicker/ColorInput.tsx
index 2a3554701c0..257f5993d1e 100644
--- a/packages/grafana-ui/src/components/ColorPicker/ColorInput.tsx
+++ b/packages/grafana-ui/src/components/ColorPicker/ColorInput.tsx
@@ -12,10 +12,11 @@ import { ColorPickerProps } from './ColorPickerPopover';
 
 interface ColorInputProps extends ColorPickerProps, Omit<InputProps, 'color' | 'onChange'> {
   isClearable?: boolean;
+  buttonAriaLabel?: string;
 }
 
 const ColorInput = forwardRef<HTMLInputElement, ColorInputProps>(
-  ({ color, onChange, isClearable = false, ...inputProps }, ref) => {
+  ({ color, onChange, isClearable = false, onClick, onBlur, disabled, buttonAriaLabel, ...inputProps }, ref) => {
     const [value, setValue] = useState(color);
     const [previousColor, setPreviousColor] = useState(color);
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -44,12 +45,14 @@ const ColorInput = forwardRef<HTMLInputElement, ColorInputProps>(
       }
     };
 
-    const onBlur = () => {
+    const onBlurInput = (event: React.FocusEvent<HTMLInputElement>) => {
       const newColor = tinycolor(value);
 
       if (!newColor.isValid()) {
         setValue(color);
       }
+
+      onBlur?.(event);
     };
 
     return (
@@ -57,8 +60,10 @@ const ColorInput = forwardRef<HTMLInputElement, ColorInputProps>(
         {...inputProps}
         value={value}
         onChange={onChangeColor}
-        onBlur={onBlur}
-        addonBefore={<ColorPreview color={color} />}
+        disabled={disabled}
+        onClick={onClick}
+        onBlur={onBlurInput}
+        addonBefore={<ColorPreview onClick={onClick} ariaLabel={buttonAriaLabel} disabled={disabled} color={color} />}
         ref={ref}
       />
     );
@@ -71,13 +76,20 @@ export default ColorInput;
 
 interface ColorPreviewProps {
   color: string;
+  onClick?: React.MouseEventHandler<HTMLElement>;
+  disabled?: boolean;
+  ariaLabel?: string;
 }
 
-const ColorPreview = ({ color }: ColorPreviewProps) => {
+const ColorPreview = ({ color, onClick, disabled, ariaLabel }: ColorPreviewProps) => {
   const styles = useStyles2(getColorPreviewStyles);
 
   return (
-    <div
+    <button
+      type="button"
+      onClick={onClick}
+      aria-label={ariaLabel}
+      disabled={disabled || !onClick}
       className={cx(
         styles,
         css`
diff --git a/packages/grafana-ui/src/components/ColorPicker/ColorPickerInput.tsx b/packages/grafana-ui/src/components/ColorPicker/ColorPickerInput.tsx
index 47742427eef..08935d39569 100644
--- a/packages/grafana-ui/src/components/ColorPicker/ColorPickerInput.tsx
+++ b/packages/grafana-ui/src/components/ColorPicker/ColorPickerInput.tsx
@@ -59,9 +59,17 @@ export const ColorPickerInput = forwardRef<HTMLInputElement, ColorPickerInputPro
               className={cx(paletteStyles.root, styles.picker)}
             />
           )}
-          <div onClick={() => setIsOpen(true)}>
-            <ColorInput {...inputProps} theme={theme} color={currentColor} onChange={setColor} ref={ref} isClearable />
-          </div>
+          <ColorInput
+            {...inputProps}
+            theme={theme}
+            color={currentColor}
+            onChange={setColor}
+            buttonAriaLabel="Open color picker"
+            onClick={() => setIsOpen(true)}
+            onBlur={() => setIsOpen(false)}
+            ref={ref}
+            isClearable
+          />
         </div>
       </ClickOutsideWrapper>
     );