diff --git a/keybindings.json b/keybindings.json
index 9a19da2..72d2163 100644
--- a/keybindings.json
+++ b/keybindings.json
@@ -151,13 +151,13 @@
     },
     {
         "key": "ctrl+n",
-        "command": "workbench.action.terminal.findNextTerminalFocus",
-        "when": "terminalFocus"
+        "command": "workbench.action.terminal.findNext",
+        "when": "terminalFocus || terminalFindWidgetFocused"
     },
     {
         "key": "ctrl+shift+n",
-        "command": "workbench.action.terminal.findPreviousTerminalFocus",
-        "when": "terminalFocus"
+        "command": "workbench.action.terminal.findPrevious",
+        "when": "terminalFocus || terminalFindWidgetFocused"
     },
     {
         "key": "ctrl+t",
@@ -267,15 +267,10 @@
         "command": "workbench.action.debug.restart",
         "when": "inDebugMode"
     },
-    {
-        "key": "ctrl+shift+c",
-        "command": "workbench.action.terminal.toggleFindCaseSensitiveTerminalFocus",
-        "when": "terminalFocus"
-    },
     {
         "key": "ctrl+shift+c",
         "command": "workbench.action.terminal.toggleFindCaseSensitive",
-        "when": "terminalFindWidgetFocused"
+        "when": "terminalFocus || terminalFindWidgetFocused"
     },
     {
         "key": "ctrl+shift+c",
@@ -287,15 +282,10 @@
         "command": "toggleSearchCaseSensitive",
         "when": "searchViewletFocus && searchViewletVisible && !fileMatchOrFolderMatchFocus"
     },
-    {
-        "key": "ctrl+shift+d",
-        "command": "workbench.action.terminal.toggleFindWholeWordTerminalFocus",
-        "when": "terminalFocus"
-    },
     {
         "key": "ctrl+shift+d",
         "command": "workbench.action.terminal.toggleFindWholeWord",
-        "when": "terminalFindWidgetFocused"
+        "when": "terminalFocus || terminalFindWidgetFocused"
     },
     {
         "key": "ctrl+shift+d",
@@ -317,16 +307,6 @@
         "command": "workbench.action.terminal.focusFindWidget",
         "when": "terminalFindWidgetFocused"
     },
-    {
-        "key": "ctrl+n",
-        "command": "workbench.action.terminal.findNextTerminalFocus",
-        "when": "terminalFindWidgetFocused"
-    },
-    {
-        "key": "ctrl+shift+n",
-        "command": "workbench.action.terminal.findPreviousTerminalFocus",
-        "when": "terminalFindWidgetFocused"
-    },
     {
         "key": "ctrl+shift+]",
         "command": "workbench.action.nextEditor",