diff --git a/mozilla/toolkit/components/autocomplete/src/nsAutoCompleteController.cpp b/mozilla/toolkit/components/autocomplete/src/nsAutoCompleteController.cpp
index f515ae7d7cc..caa17fcfccf 100644
--- a/mozilla/toolkit/components/autocomplete/src/nsAutoCompleteController.cpp
+++ b/mozilla/toolkit/components/autocomplete/src/nsAutoCompleteController.cpp
@@ -421,10 +421,14 @@ nsAutoCompleteController::HandleKeyNavigation(PRUint16 aKey, PRBool *_retval)
       } else
         StartSearchTimer();
     }    
-  } else if (aKey == nsIAutoCompleteController::KEY_LEFT ||
-             aKey == nsIAutoCompleteController::KEY_RIGHT)
+  } else if (   aKey == nsIAutoCompleteController::KEY_LEFT 
+             || aKey == nsIAutoCompleteController::KEY_RIGHT 
+#ifndef XP_MACOSX
+             || aKey == nsIAutoCompleteController::KEY_HOME
+#endif
+            )
   {
-    // The user hit a left or right arrow key
+    // The user hit a text-navigation key.
     PRBool isOpen;
     mInput->GetPopupOpen(&isOpen);
     if (isOpen) {
diff --git a/mozilla/toolkit/content/widgets/autocomplete.xml b/mozilla/toolkit/content/widgets/autocomplete.xml
index b44f2aff0dc..10a2213accc 100644
--- a/mozilla/toolkit/content/widgets/autocomplete.xml
+++ b/mozilla/toolkit/content/widgets/autocomplete.xml
@@ -380,6 +380,9 @@
               case KeyEvent.DOM_VK_RIGHT:
                 cancel = this.mController.handleKeyNavigation(IController.KEY_RIGHT);
                 break;
+              case KeyEvent.DOM_VK_HOME:
+                cancel = this.mController.handleKeyNavigation(IController.KEY_HOME);
+                break;
               case KeyEvent.DOM_VK_PAGE_UP:
                 cancel = this.mController.handleKeyNavigation(IController.KEY_PAGE_UP);
                 break;