diff --git a/client/components/combobox.jsx b/client/components/combobox.jsx
index a50ceeb5d..0aa734db9 100644
--- a/client/components/combobox.jsx
+++ b/client/components/combobox.jsx
@@ -8,8 +8,9 @@ const Combobox = createClass({
 	displayName     : 'Combobox',
 	getDefaultProps : function() {
 		return {
-			trigger : 'hover',
-			default : ''
+			trigger     : 'hover',
+			default     : '',
+			autoSuggest : true
 		};
 	},
 	getInitialState : function() {
@@ -46,8 +47,6 @@ const Combobox = createClass({
 		this.setState({
 			value : e.target.value
 		}, ()=>{
-			// const event = new Event('entry');
-			// console.log(eevent);
 			this.props.onEntry(e);
 		});
 	},
@@ -68,6 +67,14 @@ const Combobox = createClass({
 	},
 	renderDropdown : function(dropdownChildren){
 		if(!this.state.showDropdown) return null;
+		console.log(dropdownChildren);
+		if(this.props.autoSuggest === true){
+			dropdownChildren = dropdownChildren.map((item)=>({
+				...item,
+				value : item.props['data-value']
+			})).filter((item)=>item.value.includes(this.state.value));
+		}
+
 		return (
 			<div className='dropdown-options'>
 				{dropdownChildren}
diff --git a/client/homebrew/editor/metadataEditor/metadataEditor.jsx b/client/homebrew/editor/metadataEditor/metadataEditor.jsx
index 88a27e5cd..6d10e32b6 100644
--- a/client/homebrew/editor/metadataEditor/metadataEditor.jsx
+++ b/client/homebrew/editor/metadataEditor/metadataEditor.jsx
@@ -238,7 +238,8 @@ const MetadataEditor = createClass({
 				default={this.props.metadata.lang || ''}
 				onSelect={(value)=>this.handleLanguage(value)}
 				onEntry={(e)=>{this.handleFieldChange('lang', e);}}
-				options={listLanguages()}>
+				options={listLanguages()}
+				autoSuggest={true}>
 			</Combobox>
 		</div>;
 	},