diff --git a/src/common/const.ts b/src/common/const.ts
index 961ffd9d2e..c1f27c4e9d 100644
--- a/src/common/const.ts
+++ b/src/common/const.ts
@@ -45,6 +45,7 @@ export const DOMAINS_WITH_MORE_INFO = [
"media_player",
"script",
"sun",
+ "timer",
"updater",
"vacuum",
"water_heater",
diff --git a/src/data/timer.ts b/src/data/timer.ts
new file mode 100644
index 0000000000..e55b936d15
--- /dev/null
+++ b/src/data/timer.ts
@@ -0,0 +1,11 @@
+import {
+ HassEntityBase,
+ HassEntityAttributeBase,
+} from "home-assistant-js-websocket";
+
+export type TimerEntity = HassEntityBase & {
+ attributes: HassEntityAttributeBase & {
+ duration: string;
+ remaining: string;
+ };
+};
diff --git a/src/dialogs/more-info/controls/more-info-content.ts b/src/dialogs/more-info/controls/more-info-content.ts
index 2d0f0e4cc7..51dfab0c68 100644
--- a/src/dialogs/more-info/controls/more-info-content.ts
+++ b/src/dialogs/more-info/controls/more-info-content.ts
@@ -21,6 +21,7 @@ import "./more-info-lock";
import "./more-info-media_player";
import "./more-info-script";
import "./more-info-sun";
+import "./more-info-timer";
import "./more-info-updater";
import "./more-info-vacuum";
import "./more-info-water_heater";
diff --git a/src/dialogs/more-info/controls/more-info-timer.ts b/src/dialogs/more-info/controls/more-info-timer.ts
new file mode 100644
index 0000000000..e0ce0c5bb5
--- /dev/null
+++ b/src/dialogs/more-info/controls/more-info-timer.ts
@@ -0,0 +1,104 @@
+import {
+ LitElement,
+ html,
+ TemplateResult,
+ CSSResult,
+ css,
+ property,
+ PropertyValues,
+ customElement,
+} from "lit-element";
+import "@material/mwc-button";
+
+import { HomeAssistant } from "../../../types";
+import { TimerEntity } from "../../../data/timer";
+
+@customElement("more-info-timer")
+class MoreInfoTimer extends LitElement {
+ @property() public hass!: HomeAssistant;
+
+ @property() public stateObj?: TimerEntity;
+
+ protected render(): TemplateResult | void {
+ if (!this.hass || !this.stateObj) {
+ return html``;
+ }
+
+ return html`
+