diff --git a/src/uxbox/ui/workspace/settings.cljs b/src/uxbox/ui/workspace/settings.cljs
index fecf67e003..4128ed16c5 100644
--- a/src/uxbox/ui/workspace/settings.cljs
+++ b/src/uxbox/ui/workspace/settings.cljs
@@ -12,6 +12,7 @@
             [uxbox.constants :as c]
             [uxbox.rstore :as rs]
             [uxbox.data.pages :as udp]
+            [uxbox.data.workspace :as udw]
             [uxbox.ui.icons :as i]
             [uxbox.ui.mixins :as mx]
             [uxbox.ui.lightbox :as lightbox]
@@ -28,6 +29,8 @@
 
 ;; --- Form Component
 
+;; TODO: proper implement form validation
+
 (defn- settings-form-render
   [own]
   (let [local (:rum/local own)
@@ -47,7 +50,8 @@
             (on-submit [event]
               (dom/prevent-default event)
               (let [page (assoc page :options opts)]
-                (rs/emit! (udp/update-page-metadata page))
+                (rs/emit! (udp/update-page-metadata page)
+                          (udw/initialize-alignment-index (:id page)))
                 (lightbox/close!)))]
       (html
        [:form {:on-submit on-submit}