--- a/toolkit/components/satchel/nsFormFillController.cpp
+++ b/toolkit/components/satchel/nsFormFillController.cpp
@@ -316,22 +316,18 @@ nsFormFillController::SetPopupOpen(bool 
       // make sure input field is visible before showing popup (bug 320938)
       nsCOMPtr<nsIContent> content = do_QueryInterface(mFocusedInput);
       NS_ENSURE_STATE(content);
       nsCOMPtr<nsIDocShell> docShell = GetDocShellForInput(mFocusedInput);
       NS_ENSURE_STATE(docShell);
       nsCOMPtr<nsIPresShell> presShell = docShell->GetPresShell();
       NS_ENSURE_STATE(presShell);
       presShell->ScrollContentIntoView(content,
-                                       nsIPresShell::ScrollAxis(
-                                         nsIPresShell::SCROLL_MINIMUM,
-                                         nsIPresShell::SCROLL_IF_NOT_VISIBLE),
-                                       nsIPresShell::ScrollAxis(
-                                         nsIPresShell::SCROLL_MINIMUM,
-                                         nsIPresShell::SCROLL_IF_NOT_VISIBLE),
+                                       nsIPresShell::ScrollAxis(),
+                                       nsIPresShell::ScrollAxis(),
                                        nsIPresShell::SCROLL_OVERFLOW_HIDDEN);
       // mFocusedPopup can be destroyed after ScrollContentIntoView, see bug 420089
       if (mFocusedPopup) {
         nsCOMPtr<nsIDOMElement> element = do_QueryInterface(mFocusedInput);
         mFocusedPopup->OpenAutocompletePopup(this, element);
       }
     } else
       mFocusedPopup->ClosePopup();
@@ -1077,30 +1073,30 @@ nsFormFillController::AddWindowListeners
     return;
 
   EventTarget* target = aWindow->GetChromeEventHandler();
 
   if (!target)
     return;
 
   target->AddEventListener(NS_LITERAL_STRING("focus"), this,
-                           true, false);
+                           true, true);
   target->AddEventListener(NS_LITERAL_STRING("blur"), this,
-                           true, false);
+                           true, true);
   target->AddEventListener(NS_LITERAL_STRING("pagehide"), this,
                            true, false);
   target->AddEventListener(NS_LITERAL_STRING("mousedown"), this,
-                           true, false);
+                           true, true);
   target->AddEventListener(NS_LITERAL_STRING("input"), this,
-                           true, false);
-  target->AddEventListener(NS_LITERAL_STRING("keypress"), this, true, false);
+                           true, true);
+  target->AddEventListener(NS_LITERAL_STRING("keypress"), this, true, true);
   target->AddEventListener(NS_LITERAL_STRING("compositionstart"), this,
-                           true, false);
+                           true, true);
   target->AddEventListener(NS_LITERAL_STRING("compositionend"), this,
-                           true, false);
+                           true, true);
   target->AddEventListener(NS_LITERAL_STRING("contextmenu"), this,
                            true, false);
 
   // Note that any additional listeners added should ensure that they ignore
   // untrusted events, which might be sent by content that's up to no good.
 }
 
 void