From c78645f57f431d607395da2dea3dd626cfb3a3c9 Mon Sep 17 00:00:00 2001
From: Stan Janssen <elementary@finetuned.nl>
Date: Tue, 19 May 2026 09:17:58 +0200
Subject: [PATCH 1/2] Change the shortcut for Focus Sidebar to not interfere
 with text editing

The existing <ctrl>+Left would interfere when editing a filename

Closes #2677.
---
 src/View/Window.vala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/View/Window.vala b/src/View/Window.vala
index 7a787d7be..afaaf5577 100644
--- a/src/View/Window.vala
+++ b/src/View/Window.vala
@@ -161,7 +161,7 @@ public class Files.View.Window : Hdy.ApplicationWindow {
             marlin_app.set_accels_for_action ("win.back(1)", {"<Alt>Left", "XF86Back"});
             marlin_app.set_accels_for_action ("win.tab::TAB", {"<Shift><Ctrl>K"});
             marlin_app.set_accels_for_action ("win.tab::WINDOW", {"<Ctrl><Alt>N"});
-            marlin_app.set_accels_for_action ("win.focus-sidebar", {"<Ctrl>Left"});
+            marlin_app.set_accels_for_action ("win.focus-sidebar", {"<Ctrl><Alt>Left"});
         }
 
         build_window ();

From a72202d8c1856e45909621f1902ab2e4ede1ceef Mon Sep 17 00:00:00 2001
From: Stan Janssen <git@finetuned.nl>
Date: Sun, 24 May 2026 13:04:50 +0200
Subject: [PATCH 2/2] Add explicit shortcut for focusing on the current
 container

---
 src/View/Window.vala | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/View/Window.vala b/src/View/Window.vala
index afaaf5577..3000df84c 100644
--- a/src/View/Window.vala
+++ b/src/View/Window.vala
@@ -68,7 +68,8 @@ public class Files.View.Window : Hdy.ApplicationWindow {
         {"tabhistory-restore", action_tabhistory_restore, "s" },
         {"forward", action_forward, "i"},
         {"back", action_back, "i"},
-        {"focus-sidebar", action_focus_sidebar}
+        {"focus-sidebar", action_focus_sidebar},
+        {"focus-current-container", action_focus_current_container}
     };
 
     private static uint window_id = 0;
@@ -162,6 +163,7 @@ public class Files.View.Window : Hdy.ApplicationWindow {
             marlin_app.set_accels_for_action ("win.tab::TAB", {"<Shift><Ctrl>K"});
             marlin_app.set_accels_for_action ("win.tab::WINDOW", {"<Ctrl><Alt>N"});
             marlin_app.set_accels_for_action ("win.focus-sidebar", {"<Ctrl><Alt>Left"});
+            marlin_app.set_accels_for_action ("win.focus-current-container", {"<Ctrl><Alt>Right"});
         }
 
         build_window ();
@@ -1006,6 +1008,10 @@ public class Files.View.Window : Hdy.ApplicationWindow {
         sidebar.focus ();
     }
 
+    private void action_focus_current_container () {
+        grab_focus ();
+    }
+
     private void before_undo_redo () {
         doing_undo_redo = true;
         update_undo_actions ();