diff --git a/platform/platform-impl/src/com/intellij/ide/actions/Switcher.java b/platform/platform-impl/src/com/intellij/ide/actions/Switcher.java
index f75806dfd208..e6068938847f 100644
--- a/platform/platform-impl/src/com/intellij/ide/actions/Switcher.java
+++ b/platform/platform-impl/src/com/intellij/ide/actions/Switcher.java
@@ -633,9 +633,15 @@ public class Switcher extends AnAction implements DumbAware {
         case VK_ESCAPE:
           cancel();
           break;
+        case VK_END:
+          ListScrollingUtil.moveEnd(getSelectedList());
+          break;
         case VK_PAGE_DOWN:
           ListScrollingUtil.movePageDown(getSelectedList());
           break;
+        case VK_HOME:
+          ListScrollingUtil.moveHome(getSelectedList());
+          break;
         case VK_PAGE_UP:
           ListScrollingUtil.movePageUp(getSelectedList());
           break;