diff --git a/frontend/resources/styles/common/framework.scss b/frontend/resources/styles/common/framework.scss
index a9f57e3218..550d5e563d 100644
--- a/frontend/resources/styles/common/framework.scss
+++ b/frontend/resources/styles/common/framework.scss
@@ -131,6 +131,7 @@
   }
 }
 
+input[type=button][disabled],
 .btn-disabled {
   opacity: .5;
   pointer-events: none;
diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/sitemap_pageform.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar/sitemap_pageform.cljs
index 5118f1c3b1..e5a7c8adaf 100644
--- a/frontend/src/uxbox/main/ui/workspace/sidebar/sitemap_pageform.cljs
+++ b/frontend/src/uxbox/main/ui/workspace/sidebar/sitemap_pageform.cljs
@@ -111,11 +111,11 @@
         (layout-input data "notebook")
         (layout-input data "desktop")]
 
-       (when valid?
-         [:input#project-btn.btn-primary
-          {:value "Go go go!"
-           :on-click on-save
-           :type "button"}])])))
+       [:input#project-btn.btn-primary
+        {:value "Go go go!"
+         :disabled (not valid?)
+         :on-click on-save
+         :type "button"}]])))
 
 (mx/defc page-form-lightbox
   {:mixins [mx/static (forms/clear-mixin st/store :workspace-page-form)]}