diff --git a/src/partners/ui/c/SelectPartner.tsx b/src/partners/ui/c/SelectPartner.tsx
index 03002bbe0266376a26c750b6d3d51cf823a5f822..494a4b880b754f6f7265a1a2ec5f95c379a60353 100644
--- a/src/partners/ui/c/SelectPartner.tsx
+++ b/src/partners/ui/c/SelectPartner.tsx
@@ -21,7 +21,7 @@ const styles = (theme) => ({
         color: '#000',
     },
     select: {
-      minWidth: '240px',
+      width: '100%',
     },
     shortName: {
       minWidth: '6em',
@@ -29,6 +29,12 @@ const styles = (theme) => ({
       marginRight: '0.5em',
       overflow: 'hidden' as 'hidden',
     },
+    fullName: {
+      whiteSpace: 'normal' as 'normal',
+    },
+    menuItem: {
+      height: 'auto' as 'auto',
+    },
 });
 
 interface ISelectPartnerProps extends React.ClassAttributes<any> {
@@ -101,12 +107,15 @@ class SelectPartner extends React.Component<ISelectPartnerProps, any> {
 
         return (
             <FormControl fullWidth required={ required } meta={ meta } label={ t(label) }>
-                <Select error={ meta.touched && meta.error } className={ classes.select } value={ useUuid ? val || '' : val && val.uuid || '' } onChange={ this.handleChange }
+                <Select autoWidth error={ meta.touched && meta.error } className={ classes.select } value={ useUuid ? val || '' : val && val.uuid || '' } onChange={ this.handleChange }
                   input={ <Input /> }
                 >
                     { allowNull && <MenuItem key="noPartner" value=""><em>{ t('partners.public.c.select.select') }</em></MenuItem> }
                     { partners && partners.sort((a, b) => a.shortName.localeCompare(b.shortName)).map((p) =>
-                        <MenuItem key={ p.uuid } value={ p.uuid }><span className={ classes.shortName }>{ p.shortName }</span><Markdown source={ p.name }/></MenuItem>)
+                        <MenuItem className={ classes.menuItem } key={ p.uuid } value={ p.uuid }>
+                          <span className={ classes.shortName }>{ p.shortName }</span>
+                          <Markdown className={ classes.fullName } source={ p.name }/>
+                        </MenuItem>)
                     }
                 </Select>
             </FormControl>
diff --git a/src/ui/layout/sidebar/SidebarWrapper.tsx b/src/ui/layout/sidebar/SidebarWrapper.tsx
index 56d25f612d527971e39939d69a715fd9772c4856..655e0afb9ba54c8cc430649516c2f50d203fb6e6 100644
--- a/src/ui/layout/sidebar/SidebarWrapper.tsx
+++ b/src/ui/layout/sidebar/SidebarWrapper.tsx
@@ -27,6 +27,7 @@ const styles = (theme) => ({
         top: '72px',
         zIndex: 10,
         height: 'calc(100vh - 72px)',
+        flex: '0 0 0',
         '& > div': {
             top: 'auto' as 'auto',
             position: 'initial' as 'initial',