diff --git a/js/components/AccountCombobox.js b/js/components/AccountCombobox.js
index 53e4077..d9e7fb7 100644
--- a/js/components/AccountCombobox.js
+++ b/js/components/AccountCombobox.js
@@ -35,6 +35,7 @@ module.exports = React.createClass({
 				onChange={this.handleAccountChange}
 				ref="account"
 				disabled={this.props.disabled}
+				suggest
 				className={className} />
 	   );
 	}
diff --git a/js/components/AccountRegister.js b/js/components/AccountRegister.js
index 6d4cc41..1603816 100644
--- a/js/components/AccountRegister.js
+++ b/js/components/AccountRegister.js
@@ -427,6 +427,7 @@ const AddEditTransactionModal = React.createClass({
 						<Col componentClass={ControlLabel} xs={2}>Status</Col>
 						<Col xs={10}>
 						<Combobox
+							suggest
 							data={TransactionStatusList}
 							valueField='StatusId'
 							textField='Name'
diff --git a/js/components/AccountsTab.js b/js/components/AccountsTab.js
index 8579e18..b585ef5 100644
--- a/js/components/AccountsTab.js
+++ b/js/components/AccountsTab.js
@@ -130,9 +130,10 @@ const AddEditAccountModal = React.createClass({
 						<Col componentClass={ControlLabel} xs={2}>Security</Col>
 						<Col xs={10}>
 						<Combobox
+							suggest
 							data={this.props.security_list}
 							valueField='SecurityId'
-							textField={item => item.Name + " - " + item.Description}
+							textField={item => typeof item === 'string' ? item : item.Name + " - " + item.Description}
 							defaultValue={this.state.security}
 							onChange={this.handleSecurityChange}
 							ref="security" />
@@ -142,6 +143,7 @@ const AddEditAccountModal = React.createClass({
 						<Col componentClass={ControlLabel} xs={2}>Account Type</Col>
 						<Col xs={10}>
 						<Combobox
+							suggest
 							data={AccountTypeList}
 							valueField='TypeId'
 							textField='Name'