diff --git a/frontend/src/uxbox/main/data/workspace.cljs b/frontend/src/uxbox/main/data/workspace.cljs
index 2bfebf331..5592e223a 100644
--- a/frontend/src/uxbox/main/data/workspace.cljs
+++ b/frontend/src/uxbox/main/data/workspace.cljs
@@ -1329,6 +1329,7 @@
    "ctrl+shift+z" #(st/emit! dwc/redo)
    "ctrl+y" #(st/emit! dwc/redo)
    "ctrl+q" #(st/emit! dwc/reinitialize-undo)
+   "a" #(st/emit! (select-for-drawing :frame))
    "b" #(st/emit! (select-for-drawing :rect))
    "e" #(st/emit! (select-for-drawing :circle))
    "t" #(st/emit! (select-for-drawing :text))
diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/layers.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar/layers.cljs
index 6b30180c8..224a66b17 100644
--- a/frontend/src/uxbox/main/ui/workspace/sidebar/layers.cljs
+++ b/frontend/src/uxbox/main/ui/workspace/sidebar/layers.cljs
@@ -125,7 +125,7 @@
                   (:hidden item))
               nil
 
-              (.-ctrlKey event)
+              (.-shiftKey event)
               (st/emit! (dw/select-shape id true))
 
               (> (count selected) 1)