diff --git a/src/main/kotlin/com/chylex/intellij/keyboardmaster/feature/vimNavigation/components/VimListNavigation.kt b/src/main/kotlin/com/chylex/intellij/keyboardmaster/feature/vimNavigation/components/VimListNavigation.kt
index e428f15..da48d8e 100644
--- a/src/main/kotlin/com/chylex/intellij/keyboardmaster/feature/vimNavigation/components/VimListNavigation.kt
+++ b/src/main/kotlin/com/chylex/intellij/keyboardmaster/feature/vimNavigation/components/VimListNavigation.kt
@@ -28,9 +28,13 @@ internal object VimListNavigation {
 			),
 			KeyStroke.getKeyStroke('G') to IdeaAction("List-selectLastRow"),
 			KeyStroke.getKeyStroke('h') to IdeaAction("List-selectPreviousColumn"),
+			KeyStroke.getKeyStroke('H') to IdeaAction("List-selectPreviousColumnExtendSelection"),
 			KeyStroke.getKeyStroke('j') to IdeaAction("List-selectNextRow"),
+			KeyStroke.getKeyStroke('J') to IdeaAction("List-selectNextRowExtendSelection"),
 			KeyStroke.getKeyStroke('k') to IdeaAction("List-selectPreviousRow"),
+			KeyStroke.getKeyStroke('K') to IdeaAction("List-selectPreviousRowExtendSelection"),
 			KeyStroke.getKeyStroke('l') to IdeaAction("List-selectNextColumn"),
+			KeyStroke.getKeyStroke('L') to IdeaAction("List-selectNextColumnExtendSelection"),
 		)
 	)
 	
diff --git a/src/main/kotlin/com/chylex/intellij/keyboardmaster/feature/vimNavigation/components/VimTableNavigation.kt b/src/main/kotlin/com/chylex/intellij/keyboardmaster/feature/vimNavigation/components/VimTableNavigation.kt
index 33b48f6..99591b6 100644
--- a/src/main/kotlin/com/chylex/intellij/keyboardmaster/feature/vimNavigation/components/VimTableNavigation.kt
+++ b/src/main/kotlin/com/chylex/intellij/keyboardmaster/feature/vimNavigation/components/VimTableNavigation.kt
@@ -21,9 +21,13 @@ internal object VimTableNavigation {
 			),
 			KeyStroke.getKeyStroke('G') to IdeaAction("Table-selectLastRow"),
 			KeyStroke.getKeyStroke('h') to IdeaAction("Table-selectPreviousColumn"),
+			KeyStroke.getKeyStroke('H') to IdeaAction("Table-selectPreviousColumnExtendSelection"),
 			KeyStroke.getKeyStroke('j') to IdeaAction("Table-selectNextRow"),
+			KeyStroke.getKeyStroke('J') to IdeaAction("Table-selectNextRowExtendSelection"),
 			KeyStroke.getKeyStroke('k') to IdeaAction("Table-selectPreviousRow"),
+			KeyStroke.getKeyStroke('K') to IdeaAction("Table-selectPreviousRowExtendSelection"),
 			KeyStroke.getKeyStroke('l') to IdeaAction("Table-selectNextColumn"),
+			KeyStroke.getKeyStroke('L') to IdeaAction("Table-selectNextColumnExtendSelection"),
 		)
 	)
 	
diff --git a/src/main/kotlin/com/chylex/intellij/keyboardmaster/feature/vimNavigation/components/VimTreeNavigation.kt b/src/main/kotlin/com/chylex/intellij/keyboardmaster/feature/vimNavigation/components/VimTreeNavigation.kt
index 2ed7c5f..875898d 100644
--- a/src/main/kotlin/com/chylex/intellij/keyboardmaster/feature/vimNavigation/components/VimTreeNavigation.kt
+++ b/src/main/kotlin/com/chylex/intellij/keyboardmaster/feature/vimNavigation/components/VimTreeNavigation.kt
@@ -20,15 +20,17 @@ internal object VimTreeNavigation {
 			KeyStroke.getKeyStroke('g') to Parent(
 				mapOf(
 					KeyStroke.getKeyStroke('g') to IdeaAction("Tree-selectFirst"),
+					KeyStroke.getKeyStroke('j') to SelectLastSibling,
+					KeyStroke.getKeyStroke('k') to SelectFirstSibling,
 				)
 			),
 			KeyStroke.getKeyStroke('G') to IdeaAction("Tree-selectLast"),
 			KeyStroke.getKeyStroke('j') to IdeaAction("Tree-selectNext"),
 			KeyStroke.getKeyStroke('j', KeyEvent.ALT_DOWN_MASK) to IdeaAction("Tree-selectNextSibling"),
-			KeyStroke.getKeyStroke('J') to SelectLastSibling,
+			KeyStroke.getKeyStroke('J') to IdeaAction("Tree-selectNextExtendSelection"),
 			KeyStroke.getKeyStroke('k') to IdeaAction("Tree-selectPrevious"),
 			KeyStroke.getKeyStroke('k', KeyEvent.ALT_DOWN_MASK) to IdeaAction("Tree-selectPreviousSibling"),
-			KeyStroke.getKeyStroke('K') to SelectFirstSibling,
+			KeyStroke.getKeyStroke('K') to IdeaAction("Tree-selectPreviousExtendSelection"),
 			KeyStroke.getKeyStroke('o') to ExpandOrCollapseTreeNode,
 			KeyStroke.getKeyStroke('O') to IdeaAction("FullyExpandTreeNode"),
 			KeyStroke.getKeyStroke('p') to IdeaAction("Tree-selectParentNoCollapse"),