diff --git a/frontend/uxbox/ui/navigation.cljs b/frontend/uxbox/ui/navigation.cljs
index da214724a3..02a7a5c9ce 100644
--- a/frontend/uxbox/ui/navigation.cljs
+++ b/frontend/uxbox/ui/navigation.cljs
@@ -1,11 +1,11 @@
 (ns uxbox.ui.navigation
-  (:require [goog.events :as events]))
+  (:require [sablono.core :as html :refer-macros [html]]
+            [goog.events :as events]
+            [uxbox.ui.dom :as dom]))
 
 (defn link
   "Given an href and a component, return a link component that will navigate
   to the given URI withour reloading the page."
   [href component]
-  [:a
-   {:href href
-    :on-click #(do (.preventDefault %) (set-uri! href))}
-   component])
+  (html
+   [:a {:href (str "/#" href)} component]))
diff --git a/frontend/uxbox/ui/workspace.cljs b/frontend/uxbox/ui/workspace.cljs
index cb5c780c3b..c8ff56d299 100644
--- a/frontend/uxbox/ui/workspace.cljs
+++ b/frontend/uxbox/ui/workspace.cljs
@@ -49,7 +49,7 @@
     (html
      [:header#workspace-bar.workspace-bar
       [:div.main-icon
-       (nav/link (r/route-for :dashboard) i/logo-icon)]
+       (nav/link (r/route-for :main/dashboard) i/logo-icon)]
       [:div.project-tree-btn
        {:on-click (constantly nil)}
        i/project-tree