diff --git a/src/core/widgets/base/notebook/editor_events.py b/src/core/widgets/base/notebook/editor_events.py
index df31734..68bc3fb 100644
--- a/src/core/widgets/base/notebook/editor_events.py
+++ b/src/core/widgets/base/notebook/editor_events.py
@@ -64,6 +64,30 @@ class EditorEventsMixin:
         page_num = 0 if self.get_n_pages() - 1 == page_num else page_num + 1
         self.set_current_page(page_num)
 
+    def keyboard_focus_1st_pane(self):
+        if self.NAME == "notebook_1":
+            return
+
+        notebook = self.builder.get_object("notebook_1")
+        i        = notebook.get_current_page()
+        page     = notebook.get_nth_page(i)
+
+        self.set_page_focus_after_move(page, notebook)
+
+    def keyboard_focus_2nd_pane(self):
+        if self.NAME == "notebook_2":
+            return
+
+        notebook = self.builder.get_object("notebook_2")
+        if not notebook.is_visible():
+            notebook.show()
+            notebook.create_view()
+
+        i        = notebook.get_current_page()
+        page     = notebook.get_nth_page(i)
+
+        self.set_page_focus_after_move(page, notebook)
+
     def keyboard_move_tab_to_1(self, page_num):
         if self.NAME == "notebook_1": return
 
diff --git a/src/core/widgets/base/notebook/editor_notebook.py b/src/core/widgets/base/notebook/editor_notebook.py
index 19c7109..c370403 100644
--- a/src/core/widgets/base/notebook/editor_notebook.py
+++ b/src/core/widgets/base/notebook/editor_notebook.py
@@ -66,9 +66,8 @@ class EditorNotebook(EditorControllerMixin, Gtk.Notebook):
         event_system.subscribe("keyboard_open_file", self._keyboard_open_file)
         event_system.subscribe("keyboard_scale_up_text", self._keyboard_scale_up_text)
         event_system.subscribe("keyboard_scale_down_text", self._keyboard_scale_down_text)
-
-        # event_system.subscribe("keyboard_save_file_as", self._keyboard_save_file_as)
-
+        event_system.subscribe("keyboard_focus_1st_pane", self.keyboard_focus_1st_pane)
+        event_system.subscribe("keyboard_focus_2nd_pane", self.keyboard_focus_2nd_pane)
 
     def _load_widgets(self):
         self._add_action_widgets()