diff --git a/src/src/Dialogs/New.jsx b/src/src/Dialogs/New.jsx
index d160ad7a7..2cbd7e7c1 100644
--- a/src/src/Dialogs/New.jsx
+++ b/src/src/Dialogs/New.jsx
@@ -97,14 +97,14 @@ class DialogNew extends React.Component {
                         onChange={e => this.handleChange(e.target.value)}
                         margin="normal"
                     />
-                    <FormControl variant="standard" style={{minWidth: 100}}>
+                    <FormControl variant="standard" style={{width: '100%'}}>
                         <InputLabel htmlFor="parent">{I18n.t('Folder')}</InputLabel>
                         <Select
                             variant="standard"
                             style={{width: '100%'}}
                             value={this.state.parent}
                             onChange={e => this.setState({parent: e.target.value})}
-                            inputProps={{name: 'parent', id: 'parent',}}
+                            inputProps={{name: 'parent', id: 'parent'}}
                         >
                             {this.props.parents.map(parent => {
                                 const parts = parent.id.split('.');
@@ -123,7 +123,7 @@ class DialogNew extends React.Component {
                                 if (!names.length) {
                                     names.push(parent.name);
                                 }
-                                return (<MenuItem key={parent.id} value={parent.id}>{names.join(' / ')}</MenuItem>)
+                                return (<MenuItem key={parent.id} value={parent.id}>{names.join(' / ')}</MenuItem>);
                             })}
                         </Select>
                     </FormControl>
@@ -144,7 +144,7 @@ class DialogNew extends React.Component {
                                 variant="standard"
                                 value={this.state.instance}
                                 onChange={e => this.setState({instance: parseInt(e.target.value, 10)})}
-                                inputProps={{name: 'instance', id: 'instance',}}
+                                inputProps={{name: 'instance', id: 'instance'}}
                             >
                                 {this.props.instances.map(instance => (<MenuItem key={'instance' + instance} value={instance}>{instance || '0'}</MenuItem>))}
                             </Select>
diff --git a/src/src/SideMenu.jsx b/src/src/SideMenu.jsx
index 6d8be2781..f188196e9 100644
--- a/src/src/SideMenu.jsx
+++ b/src/src/SideMenu.jsx
@@ -1416,8 +1416,10 @@ class SideDrawer extends React.Component {
     getFolders() {
         const folders = [{ id: ROOT_ID, name: I18n.t('Root folder') }];
         this.state.listItems.forEach(item => {
-            if (!item.id.startsWith(GLOBAL_ID) || this.state.expertMode) {
-                item.type === 'folder' && item.id !== ROOT_ID && folders.push({ id: item.id, name: item.title });
+            if (item.type === 'folder' && item.id !== ROOT_ID) { // root has been added above
+                if (!item.id.startsWith(GLOBAL_ID) || this.state.expertMode) {
+                    folders.push({ id: item.id, name: item.title });
+                }
             }
         });
         return folders;