diff --git a/Modules/MainScreen/MainScreen.qml b/Modules/MainScreen/MainScreen.qml
index 6b20d2847..9c18781e9 100644
--- a/Modules/MainScreen/MainScreen.qml
+++ b/Modules/MainScreen/MainScreen.qml
@@ -497,6 +497,12 @@ PanelWindow {
     onActivated: PanelService.openedPanel.onPageDownPressed()
   }
 
+  Shortcut {
+    sequence: "Ctrl+H"
+    enabled: root.isPanelOpen && (PanelService.openedPanel.onCtrlHPressed !== undefined)
+    onActivated: PanelService.openedPanel.onCtrlHPressed()
+  }
+
   Shortcut {
     sequence: "Ctrl+J"
     enabled: root.isPanelOpen && (PanelService.openedPanel.onCtrlJPressed !== undefined)
@@ -509,6 +515,12 @@ PanelWindow {
     onActivated: PanelService.openedPanel.onCtrlKPressed()
   }
 
+  Shortcut {
+    sequence: "Ctrl+L"
+    enabled: root.isPanelOpen && (PanelService.openedPanel.onCtrlLPressed !== undefined)
+    onActivated: PanelService.openedPanel.onCtrlLPressed()
+  }
+
   Shortcut {
     sequence: "Ctrl+N"
     enabled: root.isPanelOpen && (PanelService.openedPanel.onCtrlNPressed !== undefined)
diff --git a/Modules/Panels/Launcher/Launcher.qml b/Modules/Panels/Launcher/Launcher.qml
index b60efd211..af55930a4 100644
--- a/Modules/Panels/Launcher/Launcher.qml
+++ b/Modules/Panels/Launcher/Launcher.qml
@@ -322,12 +322,32 @@ SmartPanel {
     selectNextPage();
   }
 
+  function onCtrlHPressed() {
+    if (isGridView) {
+      selectPreviousWrapped();
+    }
+  }
+
   function onCtrlJPressed() {
-    selectNextWrapped();
+    if (isGridView) {
+      selectNextRow();
+    } else {
+      selectNextWrapped();
+    }
   }
 
   function onCtrlKPressed() {
-    selectPreviousWrapped();
+    if (isGridView) {
+      selectPreviousRow();
+    } else {
+      selectPreviousWrapped();
+    }
+  }
+
+  function onCtrlLPressed() {
+    if (isGridView) {
+      selectNextWrapped();
+    }
   }
 
   function onCtrlNPressed() {