diff --git a/src/components/ha-form.js b/src/components/ha-form.js
index 3ac423c97..3a5cb34e7 100644
--- a/src/components/ha-form.js
+++ b/src/components/ha-form.js
@@ -103,7 +103,7 @@ class HaForm extends EventsMixin(PolymerElement) {
         <paper-dropdown-menu label="[[computeLabel(schema)]]">
           <paper-listbox slot="dropdown-content" attr-for-selected="item-name" selected="{{data}}">
             <template is="dom-repeat" items="[[schema.options]]">
-              <paper-item item-name$="[[item]]">[[item]]</paper-item>
+              <paper-item item-name$="[[_optionValue(item)]]">[[_optionLabel(item)]]</paper-item>
             </template>
           </paper-listbox>
         </paper-dropdown-menu>
@@ -169,6 +169,14 @@ class HaForm extends EventsMixin(PolymerElement) {
   _passwordFieldIcon(unmaskedPassword) {
     return unmaskedPassword ? 'hass:eye-off' : 'hass:eye';
   }
+
+  _optionValue(item) {
+    return Array.isArray(item) ? item[0] : item;
+  }
+
+  _optionLabel(item) {
+    return Array.isArray(item) ? item[1] : item;
+  }
 }
 
 customElements.define('ha-form', HaForm);