diff --git a/frontend/uxbox/ui/workspace.cljs b/frontend/uxbox/ui/workspace.cljs
index 805eed96c8..bbd1405ce1 100644
--- a/frontend/uxbox/ui/workspace.cljs
+++ b/frontend/uxbox/ui/workspace.cljs
@@ -7,7 +7,7 @@
             [uxbox.data.workspace :as dw]
             [uxbox.ui.util :as util]
             [uxbox.ui.mixins :as mx]
-            [uxbox.ui.workspace.keyboard :as wkbd]
+            [uxbox.ui.workspace.shortcuts :as wshortcuts]
             [uxbox.ui.workspace.base :as wb]
             [uxbox.ui.workspace.lateralmenu :refer (lateralmenu)]
             [uxbox.ui.workspace.pagesmngr :refer (pagesmngr)]
@@ -62,5 +62,5 @@
     :will-mount workspace-will-mount
     :transfer-state workspace-transfer-state
     :name "workspace"
-    :mixins [mx/static rum/reactive wkbd/mixin]}))
+    :mixins [mx/static rum/reactive wshortcuts/mixin]}))
 
diff --git a/frontend/uxbox/ui/workspace/keyboard.cljs b/frontend/uxbox/ui/workspace/shortcuts.cljs
similarity index 96%
rename from frontend/uxbox/ui/workspace/keyboard.cljs
rename to frontend/uxbox/ui/workspace/shortcuts.cljs
index a3c2d4f6b3..66b67a495b 100644
--- a/frontend/uxbox/ui/workspace/keyboard.cljs
+++ b/frontend/uxbox/ui/workspace/shortcuts.cljs
@@ -1,4 +1,4 @@
-(ns uxbox.ui.workspace.keyboard
+(ns uxbox.ui.workspace.shortcuts
   (:require [beicon.core :as rx]
             [uxbox.rstore :as rs]
             [uxbox.ui.keyboard :as kbd]