diff --git a/client/homebrew/editor/metadataEditor/metadataEditor.jsx b/client/homebrew/editor/metadataEditor/metadataEditor.jsx
index 5a8c4cfb0..88a27e5cd 100644
--- a/client/homebrew/editor/metadataEditor/metadataEditor.jsx
+++ b/client/homebrew/editor/metadataEditor/metadataEditor.jsx
@@ -197,20 +197,20 @@ const MetadataEditor = createClass({
 
 		if(this.props.metadata.renderer == 'legacy') {
 			dropdown =
-				<Combobox className='disabled' trigger='disabled'>
+				<Nav.dropdown className='disabled' trigger='disabled'>
 					<div>
 						{`Themes are not supported in the Legacy Renderer`} <i className='fas fa-caret-down'></i>
 					</div>
-				</Combobox>;
+				</Nav.dropdown>;
 		} else {
 			dropdown =
-				<Combobox trigger='click'>
+				<Nav.dropdown trigger='click'>
 					<div>
 						{`${_.upperFirst(currentTheme.renderer)} : ${currentTheme.name}`} <i className='fas fa-caret-down'></i>
 					</div>
 					{/*listThemes('Legacy')*/}
 					{listThemes('V3')}
-				</Combobox>;
+				</Nav.dropdown>;
 		}
 
 		return <div className='field themes'>
@@ -219,6 +219,30 @@ const MetadataEditor = createClass({
 		</div>;
 	},
 
+	renderLanguageDropdown : function(){
+		const langCodes = ['en', 'de', 'de-ch', 'fr', 'ja', 'es', 'it', 'sv', 'ru', 'zh-Hans', 'zh-Hant'];
+		const listLanguages = ()=>{
+			return _.map(langCodes.sort(), (code, index)=>{
+				const languageNames = new Intl.DisplayNames([code], { type: 'language' });
+				return <div className='item' title={''} key={`${index}`} data-value={`${code}`}>
+					{`${code}`}
+					<div className='detail'>{`${languageNames.of(code)}`}</div>
+				</div>;
+			});
+		};
+
+
+		return <div className='field language'>
+			<label>language</label>
+			<Combobox trigger='click'
+				default={this.props.metadata.lang || ''}
+				onSelect={(value)=>this.handleLanguage(value)}
+				onEntry={(e)=>{this.handleFieldChange('lang', e);}}
+				options={listLanguages()}>
+			</Combobox>
+		</div>;
+	},
+
 	renderRenderOptions : function(){
 		if(!global.enable_v3) return;
 
@@ -252,30 +276,6 @@ const MetadataEditor = createClass({
 		</div>;
 	},
 
-	renderLanguageDropdown : function(){
-		const langCodes = ['en', 'de', 'de-ch', 'fr', 'ja', 'es', 'it', 'sv', 'ru', 'zh-Hans', 'zh-Hant'];
-		const listLanguages = ()=>{
-			return _.map(langCodes.sort(), (code, index)=>{
-				const languageNames = new Intl.DisplayNames([code], { type: 'language' });
-				return <div className='item' title={''} key={`${index}`} data-value={`${code}`}>
-					{`${code}`}
-					<div className='detail'>{`${languageNames.of(code)}`}</div>
-				</div>;
-			});
-		};
-
-
-		return <div className='field language'>
-			<label>language</label>
-			<Combobox trigger='click'
-				default={this.props.metadata.lang || ''}
-				onSelect={(value)=>this.handleLanguage(value)}
-				onEntry={(e)=>{this.handleFieldChange('lang', e);}}
-				options={listLanguages()}>
-			</Combobox>
-		</div>;
-	},
-
 	render : function(){
 		return <div className='metadataEditor'>
 			<div className='field title'>