diff --git a/public/app/core/components/Picker/DescriptionOption.tsx b/public/app/core/components/Picker/DescriptionOption.tsx
index 2522eaa1a9d..9ddf13f7532 100644
--- a/public/app/core/components/Picker/DescriptionOption.tsx
+++ b/public/app/core/components/Picker/DescriptionOption.tsx
@@ -8,10 +8,10 @@ interface ExtendedOptionProps extends OptionProps<any> {
 }
 
 export const Option = (props: ExtendedOptionProps) => {
-  const { children, isSelected, data } = props;
+  const { children, isSelected, data, className } = props;
   return (
     <components.Option {...props}>
-      <div className={`description-picker-option__button btn btn-link width-19`}>
+      <div className={`description-picker-option__button btn btn-link ${className}`}>
         {isSelected && <i className="fa fa-check pull-right" aria-hidden="true" />}
         <div className="gf-form">{children}</div>
         <div className="gf-form">
diff --git a/public/app/core/components/Picker/NoOptionsMessage.tsx b/public/app/core/components/Picker/NoOptionsMessage.tsx
index ba821ef6f77..1d2ad4a179e 100644
--- a/public/app/core/components/Picker/NoOptionsMessage.tsx
+++ b/public/app/core/components/Picker/NoOptionsMessage.tsx
@@ -7,10 +7,10 @@ export interface Props {
 }
 
 export const PickerOption = (props: OptionProps<any>) => {
-  const { children } = props;
+  const { children, className } = props;
   return (
     <components.Option {...props}>
-      <div className={`description-picker-option__button btn btn-link width-19`}>{children}</div>
+      <div className={`description-picker-option__button btn btn-link ${className}`}>{children}</div>
     </components.Option>
   );
 };
diff --git a/public/app/core/components/Picker/PickerOption.tsx b/public/app/core/components/Picker/PickerOption.tsx
index 1cb350961e6..98bb5dc566e 100644
--- a/public/app/core/components/Picker/PickerOption.tsx
+++ b/public/app/core/components/Picker/PickerOption.tsx
@@ -8,10 +8,10 @@ interface ExtendedOptionProps extends OptionProps<any> {
 }
 
 export const PickerOption = (props: ExtendedOptionProps) => {
-  const { children, data } = props;
+  const { children, data, className } = props;
   return (
     <components.Option {...props}>
-      <div className={`description-picker-option__button btn btn-link width-19`}>
+      <div className={`description-picker-option__button btn btn-link ${className}`}>
         {data.avatarUrl && <img src={data.avatarUrl} alt={data.label} className="user-picker-option__avatar" />}
         {children}
       </div>
diff --git a/public/app/core/components/Picker/__snapshots__/PickerOption.test.tsx.snap b/public/app/core/components/Picker/__snapshots__/PickerOption.test.tsx.snap
index 18d23983077..74798ac5884 100644
--- a/public/app/core/components/Picker/__snapshots__/PickerOption.test.tsx.snap
+++ b/public/app/core/components/Picker/__snapshots__/PickerOption.test.tsx.snap
@@ -3,7 +3,7 @@
 exports[`PickerOption renders correctly 1`] = `
 <div>
   <div
-    className="description-picker-option__button btn btn-link width-19"
+    className="description-picker-option__button btn btn-link"
   >
     <img
       alt="User picker label"