diff --git a/frontend/src/app/main/data/workspace/history.cljs b/frontend/src/app/main/data/workspace/history.cljs
new file mode 100644
index 000000000..d97621f71
--- /dev/null
+++ b/frontend/src/app/main/data/workspace/history.cljs
@@ -0,0 +1,26 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC
+
+(ns app.main.data.workspace.history
+  (:require
+   [app.main.data.workspace.common :as dwc]
+   [app.main.data.workspace.layout :as dwl]
+   [beicon.v2.core :as rx]
+   [potok.v2.core :as ptk]))
+
+
+(defn initialize-history
+  []
+  (ptk/reify ::initialize-history
+    ptk/WatchEvent
+    (watch [_ _ stream]
+      (let [clear-history-mode #(dwl/remove-layout-flag :document-history)]
+        (rx/merge
+         (rx/of (dwl/toggle-layout-flag :document-history))
+         (->> stream
+              (rx/filter dwc/interrupt?)
+              (rx/take 1)
+              (rx/map clear-history-mode)))))))
diff --git a/frontend/src/app/main/ui/dashboard.cljs b/frontend/src/app/main/ui/dashboard.cljs
index 635cd13df..7649a264d 100644
--- a/frontend/src/app/main/ui/dashboard.cljs
+++ b/frontend/src/app/main/ui/dashboard.cljs
@@ -209,7 +209,9 @@
                     (open-permissions-dialog plugin))
                   (st/emit! (notif/error (tr "dashboard.plugins.parse-error")))))
               (fn [_]
-                (st/emit! (notif/error (tr "dashboard.plugins.bad-url"))))))))))
+                (st/emit! (notif/error (tr "dashboard.plugins.bad-url"))))))
+        (binding [storage/*sync* true]
+          (swap! storage/session dissoc :plugin-url))))))
 
 (defn use-templates-import
   [can-edit? template-url default-project-id]
diff --git a/frontend/src/app/main/ui/workspace/right_header.cljs b/frontend/src/app/main/ui/workspace/right_header.cljs
index 6cb9618e9..432dcde82 100644
--- a/frontend/src/app/main/ui/workspace/right_header.cljs
+++ b/frontend/src/app/main/ui/workspace/right_header.cljs
@@ -14,6 +14,7 @@
    [app.main.data.shortcuts :as scd]
    [app.main.data.workspace :as dw]
    [app.main.data.workspace.drawing.common :as dwc]
+   [app.main.data.workspace.history :as dwh]
    [app.main.data.workspace.shortcuts :as sc]
    [app.main.refs :as refs]
    [app.main.store :as st]
@@ -197,7 +198,7 @@
              (st/emit! :interrupt
                        (dw/clear-edition-mode)))
 
-           (st/emit! (-> (dw/toggle-layout-flag :document-history)
+           (st/emit! (-> (dwh/initialize-history)
                          (vary-meta assoc ::ev/origin "workspace-header")))))
 
         open-share-dialog