diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2133832409d2..c1453c99c3dd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -67,6 +67,8 @@
visualisation of the edited node to preview the results of applying the
suggestion.][3691]
- [Remove here keyword from IDE.][3749]
+- [Shortcut changes:][3823] Pressing `Enter` when no node is edited opens
+ Component Browser. Entering node shortcut changed to `cmd` + `Enter`.
#### EnsoGL (rendering engine)
@@ -348,6 +350,7 @@
[3790]: https://github.com/enso-org/enso/pull/3790
[3805]: https://github.com/enso-org/enso/pull/3805
[3812]: https://github.com/enso-org/enso/pull/3812
+[3823]: https://github.com/enso-org/enso/pull/3823
#### Enso Compiler
diff --git a/app/gui/docs/product/shortcuts.md b/app/gui/docs/product/shortcuts.md
index 44d6e0351039..e5319f81020b 100644
--- a/app/gui/docs/product/shortcuts.md
+++ b/app/gui/docs/product/shortcuts.md
@@ -9,7 +9,7 @@ tags: [product, ui]
#### The meta key.
-The meta key was introduced to make the shortcuts consistent across
+The cmd key was introduced to make the shortcuts consistent across
platforms. It is defined as command on macOS, and as ctrl
on Windows and Linux.
@@ -39,7 +39,7 @@ broken and require further investigation.
| cmd+alt+shift+t | Toggle light/dark application style. Currently doesn't work properly, as the Theme Switcher is not created yet. (https://github.com/enso-org/ide/issues/795) |
| ctrl+` | Show Code Editor. Please note that the Code Editor implementation is in a very early stage and you should not use it. Even just openning it can cause errors in the IDE. Do not try using the graph editor while having the code editor tab openned. |
| cmd+o | Open project |
-| meta+s | Save module |
+| cmd+s | Save module |
| cmd+z | Undo last action |
| cmd+y | Redo last undone action |
| cmd+q | Close the application (MacOS) |
@@ -59,7 +59,7 @@ broken and require further investigation.
| RMB drag | Zoom the scene. |
| LMB double press node name | Step into the node. |
| :warning: LMB double press background | Step out of the current node. |
-| enter | Step in the last selected node. |
+| cmd+enter | Step in the last selected node. |
| alt+enter | Step out of the current node. |
#### Node Layout
@@ -90,14 +90,16 @@ broken and require further investigation.
#### Node Editing
-| Shortcut | Action |
-| ------------------------------------------------ | -------------------------------------------- |
-| tab | Show / hide node searcher. |
-| backspace or delete | Remove selected nodes. |
-| cmd+g | Collapse (group) selected nodes. |
-| meta+LMB | Start editing node expression. |
-| meta+enter | Start editing node expression. |
-| enter or LMB on suggestion | Pick selected suggestion and commit editing. |
+| Shortcut | Action |
+| ------------------------------------------------ | ----------------------------------------------------------- |
+| tab | Open Component Browser to create a new node . |
+| backspace or delete | Remove selected nodes. |
+| cmd+g | Collapse (group) selected nodes. |
+| cmd+LMB | Start editing node expression. |
+| cmd+enter | Start editing node expression. |
+| enter or LMB on suggestion | Pick selected suggestion and commit editing. |
+| cmd + enter | Accept the current Component Browser expression input as-is |
+| tab | Pick selected suggestion and continue editing. |
#### Visualization
@@ -111,10 +113,10 @@ broken and require further investigation.
#### Visualizations Implementations
-| Shortcut | Action |
-| ------------------------------ | -------------------------------------------------- |
-| meta + a | Show all points if available in visualization. |
-| meta + z | Zoom into selection if available in visualization. |
+| Shortcut | Action |
+| ----------------------------- | -------------------------------------------------- |
+| cmd + a | Show all points if available in visualization. |
+| cmd + z | Zoom into selection if available in visualization. |
#### Debug
diff --git a/app/gui/view/graph-editor/src/lib.rs b/app/gui/view/graph-editor/src/lib.rs
index a02d6378c698..b003b0ff09bf 100644
--- a/app/gui/view/graph-editor/src/lib.rs
+++ b/app/gui/view/graph-editor/src/lib.rs
@@ -2513,6 +2513,7 @@ impl application::View for GraphEditor {
use shortcut::ActionType::*;
[
(Press, "!node_editing", "tab", "start_node_creation"),
+ (Press, "!node_editing", "enter", "start_node_creation"),
// === Drag ===
(Press, "", "left-mouse-button", "node_press"),
(Release, "", "left-mouse-button", "node_release"),
@@ -2549,12 +2550,11 @@ impl application::View for GraphEditor {
(DoublePress, "", "left-mouse-button", "enter_hovered_node"),
(DoublePress, "", "left-mouse-button", "start_node_creation_from_port"),
(Press, "", "right-mouse-button", "start_node_creation_from_port"),
- (Press, "!node_editing", "enter", "enter_selected_node"),
+ (Press, "!node_editing", "cmd enter", "enter_selected_node"),
(Press, "", "alt enter", "exit_node"),
// === Node Editing ===
(Press, "", "cmd", "edit_mode_on"),
(Release, "", "cmd", "edit_mode_off"),
- (Press, "!node_editing", "cmd enter", "edit_selected_node"),
(Press, "", "cmd left-mouse-button", "edit_mode_on"),
(Release, "", "cmd left-mouse-button", "edit_mode_off"),
(Press, "node_editing", "cmd enter", "stop_editing"),