diff --git a/js/components/AccountCombobox.js b/js/components/AccountCombobox.js
index 8f7482b..c788907 100644
--- a/js/components/AccountCombobox.js
+++ b/js/components/AccountCombobox.js
@@ -5,15 +5,17 @@ var Combobox = require('react-widgets').Combobox;
 var getAccountDisplayList = require('../utils').getAccountDisplayList;
 
 class AccountCombobox extends React.Component {
-	constructor() {
-		super();
-		this.onAccountChange = this.handleAccountChange.bind(this);
-		this.defaultProps = {
+	static get defaultProps() {
+		return {
 			includeRoot: true,
 			disabled: false,
 			rootName: "New Top-level Account"
 		}
 	}
+	constructor() {
+		super();
+		this.onAccountChange = this.handleAccountChange.bind(this);
+	}
 	handleAccountChange(account) {
 		if (this.props.onChange != null &&
 				account.hasOwnProperty('AccountId') &&