From 1b2e052f05eefd2e985369541309b20841da454c Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Wed, 16 Jan 2019 22:57:54 +0100
Subject: [PATCH] Activate edit mode after taking control (#2486)

* Activate edit mode after taking control

* Move to take-control
---
 src/panels/lovelace/editor/hui-dialog-save-config.ts |  1 +
 src/panels/lovelace/ha-panel-lovelace.ts             | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/panels/lovelace/editor/hui-dialog-save-config.ts b/src/panels/lovelace/editor/hui-dialog-save-config.ts
index 4e2a411ac1..b13b52cbd0 100644
--- a/src/panels/lovelace/editor/hui-dialog-save-config.ts
+++ b/src/panels/lovelace/editor/hui-dialog-save-config.ts
@@ -112,6 +112,7 @@ export class HuiSaveConfig extends hassLocalizeLitMixin(LitElement) {
     try {
       const lovelace = this._params!.lovelace;
       await lovelace.saveConfig(lovelace.config);
+      lovelace.setEditMode(true);
       this._saving = false;
       this._closeDialog();
     } catch (err) {
diff --git a/src/panels/lovelace/ha-panel-lovelace.ts b/src/panels/lovelace/ha-panel-lovelace.ts
index eb3821979b..98ca2f1abd 100644
--- a/src/panels/lovelace/ha-panel-lovelace.ts
+++ b/src/panels/lovelace/ha-panel-lovelace.ts
@@ -184,13 +184,19 @@ class LovelacePanel extends hassLocalizeLitMixin(LitElement) {
         const { config, mode } = this.lovelace!;
         try {
           // Optimistic update
-          this._updateLovelace({ config: newConfig, mode: "storage" });
+          this._updateLovelace({
+            config: newConfig,
+            mode: "storage",
+          });
           await saveConfig(this.hass!, newConfig);
         } catch (err) {
           // tslint:disable-next-line
           console.error(err);
           // Rollback the optimistic update
-          this._updateLovelace({ config, mode });
+          this._updateLovelace({
+            config,
+            mode,
+          });
           throw err;
         }
       },