diff --git a/src/components/entity/ha-entity-picker.js b/src/components/entity/ha-entity-picker.js
index fcebf86019..16f6472406 100644
--- a/src/components/entity/ha-entity-picker.js
+++ b/src/components/entity/ha-entity-picker.js
@@ -38,7 +38,16 @@ class HaEntityPicker extends EventsMixin(LocalizeMixin(PolymerElement)) {
allow-custom-value="[[allowCustomEntity]]"
on-change='_fireChanged'
>
-
+
Clear
Toggle
diff --git a/src/panels/dev-service/ha-panel-dev-service.js b/src/panels/dev-service/ha-panel-dev-service.js
index bcac296460..5cdb595a85 100644
--- a/src/panels/dev-service/ha-panel-dev-service.js
+++ b/src/panels/dev-service/ha-panel-dev-service.js
@@ -120,6 +120,10 @@ class HaPanelDevService extends PolymerElement {
always-float-label
label='Service Data (JSON, optional)'
value='{{serviceData}}'
+ autocapitalize='none'
+ autocomplete='off'
+ autocorrect='off'
+ spellcheck='false'
>
-
+
Set State