diff --git a/src/uxbox/locales/en.cljs b/src/uxbox/locales/en.cljs
index c87a593d3..0a4469bf2 100644
--- a/src/uxbox/locales/en.cljs
+++ b/src/uxbox/locales/en.cljs
@@ -24,6 +24,7 @@
    "ds.element-options" "Element options"
    "ds.draw-tools" "Draw tools"
    "ds.sitemap" "Sitemap"
+   "ds.document-history" "Document history"
 
    "ds.help.rect" "Box (Ctrl + B)"
    "ds.help.circle" "Circle (Ctrl + E)"
diff --git a/src/uxbox/ui/workspace.cljs b/src/uxbox/ui/workspace.cljs
index c7af34d83..32ec1b3d5 100644
--- a/src/uxbox/ui/workspace.cljs
+++ b/src/uxbox/ui/workspace.cljs
@@ -41,7 +41,7 @@
 (defn- workspace-render
   [own projectid]
   (let [{:keys [flags] :as workspace} (rum/react wb/workspace-l)
-        left-sidebar? (not (empty? (keep flags [:layers :sitemap])))
+        left-sidebar? (not (empty? (keep flags [:layers :sitemap :document-history])))
         right-sidebar? (not (empty? (keep flags [:icons :drawtools
                                                  :element-options])))
         local (:rum/local own)
diff --git a/src/uxbox/ui/workspace/header.cljs b/src/uxbox/ui/workspace/header.cljs
index ebaa2efd7..15af10cd6 100644
--- a/src/uxbox/ui/workspace/header.cljs
+++ b/src/uxbox/ui/workspace/header.cljs
@@ -81,8 +81,8 @@
          i/options]
         [:li.tooltip.tooltip-bottom
          {:alt "History (Ctrl + Shift + H)"
-          :class (when (contains? flags :element-options))
-          :on-click (partial toggle :element-options)}
+          :class (when (contains? flags :document-history))
+          :on-click (partial toggle :document-history)}
          i/undo-history]]
        [:ul.options-btn
         [:li.tooltip.tooltip-bottom {:alt "Undo (Ctrl + Z)"}
diff --git a/src/uxbox/ui/workspace/sidebar.cljs b/src/uxbox/ui/workspace/sidebar.cljs
index 626a9344c..7259e869d 100644
--- a/src/uxbox/ui/workspace/sidebar.cljs
+++ b/src/uxbox/ui/workspace/sidebar.cljs
@@ -10,6 +10,7 @@
             [uxbox.ui.workspace.sidebar.options :refer (options-toolbox)]
             [uxbox.ui.workspace.sidebar.layers :refer (layers-toolbox)]
             [uxbox.ui.workspace.sidebar.sitemap :refer (sitemap-toolbox)]
+            [uxbox.ui.workspace.sidebar.document-history :refer (document-history-toolbox)]
             [uxbox.ui.workspace.sidebar.icons :refer (icons-toolbox)]
             [uxbox.ui.workspace.sidebar.drawtools :refer (draw-toolbox)]))
 
@@ -25,6 +26,8 @@
       [:div.settings-bar-inside
        (when (contains? flags :sitemap)
          (sitemap-toolbox))
+       (when (contains? flags :document-history)
+         (document-history-toolbox))
        (when (contains? flags :layers)
          (layers-toolbox))]])))
 
diff --git a/src/uxbox/ui/workspace/sidebar/document-history.cljs b/src/uxbox/ui/workspace/sidebar/document-history.cljs
new file mode 100644
index 000000000..fa053cf84
--- /dev/null
+++ b/src/uxbox/ui/workspace/sidebar/document-history.cljs
@@ -0,0 +1,40 @@
+(ns uxbox.ui.workspace.sidebar.document-history
+  (:require [sablono.core :as html :refer-macros [html]]
+            [rum.core :as rum]
+            [cats.labs.lens :as l]
+            [uxbox.locales :refer (tr)]
+            [uxbox.router :as r]
+            [uxbox.rstore :as rs]
+            [uxbox.state :as st]
+            [uxbox.shapes :as shapes]
+            [uxbox.library :as library]
+            [uxbox.util.data :refer (read-string)]
+            [uxbox.data.workspace :as dw]
+            [uxbox.ui.workspace.base :as wb]
+            [uxbox.ui.icons :as i]
+            [uxbox.ui.mixins :as mx]
+            [uxbox.util.dom :as dom]))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Component
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defn document-history-toolbox-render
+  [open-toolboxes]
+  (let [workspace (rum/react wb/workspace-l)
+        close #(rs/emit! (dw/toggle-flag :document-history))]
+    (html
+     [:div.document-history.tool-window
+      [:div.tool-window-bar
+       [:div.tool-window-icon i/undo-history]
+       [:span (tr "ds.document-history")]
+       [:div.tool-window-close {:on-click close} i/close]]
+      [:div.tool-window-content
+       [:span "DOCUMENT HISTORY CONTENT"]
+        ]])))
+
+(def ^:static document-history-toolbox
+  (mx/component
+   {:render document-history-toolbox-render
+    :name "document-history-toolbox"
+    :mixins [mx/static rum/reactive]}))