diff --git a/public/app/core/components/Permissions/AddPermissions.tsx b/public/app/core/components/Permissions/AddPermissions.tsx
index fa2e69f17b3..5a5c9b83137 100644
--- a/public/app/core/components/Permissions/AddPermissions.tsx
+++ b/public/app/core/components/Permissions/AddPermissions.tsx
@@ -103,13 +103,23 @@ class AddPermissions extends Component<IProps, any> {
 
             {newItem.type === 'User' ? (
               <div className="gf-form">
-                <UserPicker backendSrv={backendSrv} handlePicked={this.userPicked} value={newItem.userId} />
+                <UserPicker
+                  backendSrv={backendSrv}
+                  handlePicked={this.userPicked}
+                  value={newItem.userId}
+                  className="width-8"
+                />
               </div>
             ) : null}
 
             {newItem.type === 'Group' ? (
               <div className="gf-form">
-                <TeamPicker backendSrv={backendSrv} handlePicked={this.teamPicked} value={newItem.teamId} />
+                <TeamPicker
+                  backendSrv={backendSrv}
+                  handlePicked={this.teamPicked}
+                  value={newItem.teamId}
+                  className="width-8"
+                />
               </div>
             ) : null}
 
diff --git a/public/app/core/components/Picker/TeamPicker.tsx b/public/app/core/components/Picker/TeamPicker.tsx
index 82809ee1cf6..2dfff1850dd 100644
--- a/public/app/core/components/Picker/TeamPicker.tsx
+++ b/public/app/core/components/Picker/TeamPicker.tsx
@@ -10,6 +10,7 @@ export interface IProps {
   toggleLoading: any;
   handlePicked: (user) => void;
   value?: string;
+  className?: string;
 }
 
 export interface Team {
@@ -55,7 +56,7 @@ class TeamPicker extends Component<IProps, any> {
 
   render() {
     const AsyncComponent = this.state.creatable ? Select.AsyncCreatable : Select.Async;
-    const { isLoading, handlePicked, value } = this.props;
+    const { isLoading, handlePicked, value, className } = this.props;
 
     return (
       <div className="user-picker">
@@ -69,7 +70,7 @@ class TeamPicker extends Component<IProps, any> {
           loadingPlaceholder="Loading..."
           noResultsText="No teams found"
           onChange={handlePicked}
-          className="width-12 gf-form-input gf-form-input--form-dropdown"
+          className={`gf-form-input gf-form-input--form-dropdown ${className || ''}`}
           optionComponent={PickerOption}
           placeholder="Choose"
           value={value}
diff --git a/public/app/core/components/Picker/UserPicker.tsx b/public/app/core/components/Picker/UserPicker.tsx
index 129c012692a..5c36505aeaa 100644
--- a/public/app/core/components/Picker/UserPicker.tsx
+++ b/public/app/core/components/Picker/UserPicker.tsx
@@ -10,6 +10,7 @@ export interface IProps {
   toggleLoading: any;
   handlePicked: (user) => void;
   value?: string;
+  className?: string;
 }
 
 export interface User {
@@ -54,7 +55,7 @@ class UserPicker extends Component<IProps, any> {
 
   render() {
     const AsyncComponent = this.state.creatable ? Select.AsyncCreatable : Select.Async;
-    const { isLoading, handlePicked, value } = this.props;
+    const { isLoading, handlePicked, value, className } = this.props;
     return (
       <div className="user-picker">
         <AsyncComponent
@@ -67,7 +68,7 @@ class UserPicker extends Component<IProps, any> {
           loadingPlaceholder="Loading..."
           noResultsText="No users found"
           onChange={handlePicked}
-          className="width-12 gf-form-input gf-form-input--form-dropdown"
+          className={`gf-form-input gf-form-input--form-dropdown ${className || ''}`}
           optionComponent={PickerOption}
           placeholder="Choose"
           value={value}
diff --git a/public/app/core/components/Picker/withPicker.tsx b/public/app/core/components/Picker/withPicker.tsx
index cf3954850b2..838ef927c30 100644
--- a/public/app/core/components/Picker/withPicker.tsx
+++ b/public/app/core/components/Picker/withPicker.tsx
@@ -4,6 +4,7 @@ export interface IProps {
   backendSrv: any;
   handlePicked: (data) => void;
   value?: string;
+  className?: string;
 }
 
 export default function withPicker(WrappedComponent) {