diff --git a/AppKit/CPEvent.j b/AppKit/CPEvent.j
index 75b228a1e..bea98195a 100644
--- a/AppKit/CPEvent.j
+++ b/AppKit/CPEvent.j
@@ -576,6 +576,8 @@ var _CPEventPeriodicEventPeriod         = 0,
             case CPUpArrowFunctionKey:
             case CPRightArrowFunctionKey:
             case CPDownArrowFunctionKey:
+            case CPEndFunctionKey:
+            case CPHomeFunctionKey:
                 return YES;
         }
     }
diff --git a/Tests/Manual/KeyEquivalents/AppController.j b/Tests/Manual/KeyEquivalents/AppController.j
index dbd33b410..2ce94fea8 100644
--- a/Tests/Manual/KeyEquivalents/AppController.j
+++ b/Tests/Manual/KeyEquivalents/AppController.j
@@ -83,7 +83,9 @@
         ["left arrow", CPLeftArrowFunctionKey],
         ["up arrow", CPUpArrowFunctionKey],
         ["right arrow", CPRightArrowFunctionKey],
-        ["down arrow", CPDownArrowFunctionKey]
+        ["down arrow", CPDownArrowFunctionKey],
+        ["home", CPHomeFunctionKey],
+        ["end", CPEndFunctionKey]
         ];
 
     for (var i = 0, buttonsWide = 6, yOffset = 0; i < functionKeysToTest.length; i++)