diff --git a/README.md b/README.md
index 5f00b2a..e1d4920 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 
 
-[![Version](https://img.shields.io/badge/version-0.0.4-green.svg?style=for-the-badge)](#) [![mantained](https://img.shields.io/maintenance/yes/2019.svg?style=for-the-badge)](#)
+[![Version](https://img.shields.io/badge/version-0.0.5-green.svg?style=for-the-badge)](#) [![mantained](https://img.shields.io/maintenance/yes/2019.svg?style=for-the-badge)](#)
 
 [![maintainer](https://img.shields.io/badge/maintainer-Ian%20Richardson%20%40iantrich-blue.svg?style=for-the-badge)](#)
 
@@ -23,6 +23,7 @@ This card is for [Lovelace](https://www.home-assistant.io/lovelace) on [Home Ass
 | ---- | ---- | ------- | -----------
 | type | string | **Required** | `custom:roku-card`
 | entity | string | **Required** | `media_player` entity of Roku device
+| remote | string | **Optional** | `remote` entity of Roku device. Default assume named like `entity`
 | name | string | **Optional** | Card name
 | theme | string | **Optional** | Card theme
 | tv | boolean | **Optional** | If `true` shows volume and power buttons. Default `false`
diff --git a/roku-card-editor.js b/roku-card-editor.js
index bed2fee..16db73b 100644
--- a/roku-card-editor.js
+++ b/roku-card-editor.js
@@ -38,6 +38,10 @@ export class RokuCardEditor extends LitElement {
     return this._config.entity || "";
   }
 
+  get _remote() {
+    return this._config.remote || "";
+  }
+
   get _theme() {
     return this._config.theme;
   }
@@ -56,7 +60,7 @@ export class RokuCardEditor extends LitElement {
       <div class="card-config">
         <div class="side-by-side">
           <paper-input
-            label="Name"
+            label="Name (Optional)"
             .value="${this._name}"
             .configValue="${"name"}"
             @value-changed="${this._valueChanged}"
@@ -82,6 +86,27 @@ export class RokuCardEditor extends LitElement {
                   ></paper-input>
                 `
           }
+          ${
+            customElements.get("ha-entity-picker")
+              ? html`
+                  <ha-entity-picker
+                    .hass="${this.hass}"
+                    .value="${this._remote}"
+                    .configValue=${"remote"}
+                    domain-filter="remote"
+                    @change="${this._valueChanged}"
+                    allow-custom-entity
+                  ></ha-entity-picker>
+                `
+              : html`
+                  <paper-input
+                    label="Remote (Optional)"
+                    .value="${this._remote}"
+                    .configValue="${"remote"}"
+                    @value-changed="${this._valueChanged}"
+                  ></paper-input>
+                `
+          }
           </div>
           <div class="side-by-side">
           ${
@@ -96,7 +121,7 @@ export class RokuCardEditor extends LitElement {
                 `
               : html`
                   <paper-input
-                    label="Theme"
+                    label="Theme (Optional)"
                     .value="${this._theme}"
                     .configValue="${"theme"}"
                     @value-changed="${this._valueChanged}"
diff --git a/roku-card.js b/roku-card.js
index 4d35649..56be6fd 100644
--- a/roku-card.js
+++ b/roku-card.js
@@ -234,7 +234,7 @@ class RokuCard extends LitElement {
   }
 
   handleActionClick(e) {
-    let remote = this._config.entity.split(".")[1];
+    let remote = this._config.remote ? this._config.remote : this._config.entity.split(".")[1];
     this.hass.callService("remote", "send_command", {
       entity_id: "remote." + remote,
       command: e.currentTarget.action