diff --git a/src/uxbox/main/data/shapes.cljs b/src/uxbox/main/data/shapes.cljs
index c0bb86d9fa..168b07c6ae 100644
--- a/src/uxbox/main/data/shapes.cljs
+++ b/src/uxbox/main/data/shapes.cljs
@@ -19,8 +19,7 @@
             [uxbox.main.state.shapes :as stsh]
             [uxbox.main.data.core :refer (worker)]
             [uxbox.main.data.pages :as udp]
-            ;; FIXME: rlocks should be moved out of ui.workspace
-            [uxbox.main.ui.workspace.rlocks :as rlocks]
+            [uxbox.util.rlocks :as rlocks]
             [uxbox.util.geom.point :as gpt]
             [uxbox.util.data :refer (index-of)]))
 
diff --git a/src/uxbox/main/ui/shapes/common.cljs b/src/uxbox/main/ui/shapes/common.cljs
index d54a045502..5cb8783106 100644
--- a/src/uxbox/main/ui/shapes/common.cljs
+++ b/src/uxbox/main/ui/shapes/common.cljs
@@ -13,7 +13,7 @@
             [uxbox.main.data.shapes :as uds]
             [uxbox.main.ui.keyboard :as kbd]
             [uxbox.main.ui.workspace.base :as wb]
-            [uxbox.main.ui.workspace.rlocks :as rlocks]
+            [uxbox.util.rlocks :as rlocks]
             [uxbox.main.geom :as geom]
             [uxbox.util.dom :as dom]))
 
diff --git a/src/uxbox/main/ui/shapes/selection.cljs b/src/uxbox/main/ui/shapes/selection.cljs
index fb38f651ab..fdc42e4d44 100644
--- a/src/uxbox/main/ui/shapes/selection.cljs
+++ b/src/uxbox/main/ui/shapes/selection.cljs
@@ -14,7 +14,7 @@
             [uxbox.util.rstore :as rs]
             [uxbox.main.data.shapes :as uds]
             [uxbox.main.ui.workspace.base :as wb]
-            [uxbox.main.ui.workspace.rlocks :as rlocks]
+            [uxbox.util.rlocks :as rlocks]
             [uxbox.main.ui.shapes.common :as scommon]
             [uxbox.main.geom :as geom]
             [uxbox.util.geom.point :as gpt]
diff --git a/src/uxbox/main/ui/shapes/text.cljs b/src/uxbox/main/ui/shapes/text.cljs
index f9ba5eca3c..f864e96119 100644
--- a/src/uxbox/main/ui/shapes/text.cljs
+++ b/src/uxbox/main/ui/shapes/text.cljs
@@ -15,7 +15,7 @@
             [uxbox.main.data.shapes :as uds]
             [uxbox.main.ui.shapes.common :as common]
             [uxbox.main.ui.shapes.attrs :as attrs]
-            [uxbox.main.ui.workspace.rlocks :as rlocks]
+            [uxbox.util.rlocks :as rlocks]
             [uxbox.main.geom :as geom])
   (:import goog.events.EventType))
 
diff --git a/src/uxbox/main/ui/workspace/canvas.cljs b/src/uxbox/main/ui/workspace/canvas.cljs
index e9d6263dce..24893b8ed4 100644
--- a/src/uxbox/main/ui/workspace/canvas.cljs
+++ b/src/uxbox/main/ui/workspace/canvas.cljs
@@ -22,7 +22,7 @@
             [uxbox.main.ui.shapes :as uus]
             [uxbox.main.ui.shapes.selection :refer (selection-handlers)]
             [uxbox.main.ui.workspace.base :as wb]
-            [uxbox.main.ui.workspace.rlocks :as rlocks]
+            [uxbox.util.rlocks :as rlocks]
             [uxbox.main.ui.workspace.drawarea :refer (draw-area)]
             [uxbox.main.ui.workspace.ruler :refer (ruler)]
             [uxbox.main.ui.workspace.selrect :refer (selrect)]
diff --git a/src/uxbox/main/ui/workspace/drawarea.cljs b/src/uxbox/main/ui/workspace/drawarea.cljs
index 52b7380878..9f2ce3e5e1 100644
--- a/src/uxbox/main/ui/workspace/drawarea.cljs
+++ b/src/uxbox/main/ui/workspace/drawarea.cljs
@@ -15,7 +15,7 @@
             [uxbox.main.data.shapes :as uds]
             [uxbox.main.ui.shapes :as shapes]
             [uxbox.main.ui.workspace.base :as wb]
-            [uxbox.main.ui.workspace.rlocks :as rlocks]
+            [uxbox.util.rlocks :as rlocks]
             [uxbox.main.geom :as geom]
             [uxbox.util.geom.point :as gpt]
             [uxbox.util.geom.path :as path]
diff --git a/src/uxbox/main/ui/workspace/scroll.cljs b/src/uxbox/main/ui/workspace/scroll.cljs
index 41a554d7cb..34f37d1e25 100644
--- a/src/uxbox/main/ui/workspace/scroll.cljs
+++ b/src/uxbox/main/ui/workspace/scroll.cljs
@@ -10,7 +10,7 @@
   (:require [beicon.core :as rx]
             [uxbox.util.mixins :as mx]
             [uxbox.main.ui.workspace.base :as wb]
-            [uxbox.main.ui.workspace.rlocks :as rlocks]
+            [uxbox.util.rlocks :as rlocks]
             [uxbox.util.geom.point :as gpt]))
 
 (defn watch-scroll-interactions
diff --git a/src/uxbox/main/ui/workspace/selrect.cljs b/src/uxbox/main/ui/workspace/selrect.cljs
index a0e7dad0b7..dfb8092aff 100644
--- a/src/uxbox/main/ui/workspace/selrect.cljs
+++ b/src/uxbox/main/ui/workspace/selrect.cljs
@@ -14,7 +14,7 @@
             [uxbox.main.data.workspace :as dw]
             [uxbox.main.data.shapes :as uds]
             [uxbox.main.ui.workspace.base :as wb]
-            [uxbox.main.ui.workspace.rlocks :as rlocks]))
+            [uxbox.util.rlocks :as rlocks]))
 
 (defonce position (atom nil))
 
diff --git a/src/uxbox/main/ui/workspace/rlocks.cljs b/src/uxbox/util/rlocks.cljs
similarity index 96%
rename from src/uxbox/main/ui/workspace/rlocks.cljs
rename to src/uxbox/util/rlocks.cljs
index c180c8712e..592f48b118 100644
--- a/src/uxbox/main/ui/workspace/rlocks.cljs
+++ b/src/uxbox/util/rlocks.cljs
@@ -4,7 +4,7 @@
 ;;
 ;; Copyright (c) 2016 Andrey Antukh <niwi@niwi.nz>
 
-(ns uxbox.main.ui.workspace.rlocks
+(ns uxbox.util.rlocks
   "Reactive locks abstraction.
 
   Mainly used for lock the interface to do one concrete user action