diff --git a/src/core/components/layout-utils.jsx b/src/core/components/layout-utils.jsx
index d1adfeb1..1601681f 100644
--- a/src/core/components/layout-utils.jsx
+++ b/src/core/components/layout-utils.jsx
@@ -183,7 +183,7 @@ export class Select extends React.Component {
         { allowEmptyValue ? <option value="">--</option> : null }
         {
           allowedValues.map(function (item, key) {
-            return <option key={ key } value={ String(item) }>{ item }</option>
+            return <option key={ key } value={ String(item) }>{ String(item) }</option>
           })
         }
       </select>
diff --git a/src/core/json-schema-components.js b/src/core/json-schema-components.js
index eeb294f3..222f4053 100644
--- a/src/core/json-schema-components.js
+++ b/src/core/json-schema-components.js
@@ -189,8 +189,8 @@ export class JsonSchema_boolean extends Component {
     return (<Select className={ errors.length ? "invalid" : ""}
                     title={ errors.length ? errors  : ""}
                     value={ String(value) }
-                    allowedValues={ fromJS(["true", "false"]) }
-                    allowEmptyValue={ true }
+                    allowedValues={ fromJS(schema.enum || ["true", "false"]) }
+                    allowEmptyValue={ !this.props.required }
                     onChange={ this.onEnumChange }/>)
   }
 }
diff --git a/test/components/json-schema-form.js b/test/components/json-schema-form.js
index 7bd528e7..abf73d39 100644
--- a/test/components/json-schema-form.js
+++ b/test/components/json-schema-form.js
@@ -85,7 +85,7 @@ describe("<JsonSchemaForm/>", function(){
       expect(wrapper.find("select option").eq(1).text()).toEqual("true")
       expect(wrapper.find("select option").eq(2).text()).toEqual("false")
     })
-    
+
     it("should render the correct options for a required enum boolean parameter", function(){
 
       let props = {
@@ -105,7 +105,7 @@ describe("<JsonSchemaForm/>", function(){
 
       expect(wrapper.find("select").length).toEqual(1)
       expect(wrapper.find("select option").length).toEqual(1)
-      expect(wrapper.find("select option").eq(1).text()).toEqual("true")
+      expect(wrapper.find("select option").first().text()).toEqual("true")
     })
   })
 })