diff --git a/lib/passwordRetrieval.js b/lib/passwordRetrieval.js
index 1c129027..c40ebbff 100644
--- a/lib/passwordRetrieval.js
+++ b/lib/passwordRetrieval.js
@@ -36,7 +36,13 @@ function fillIn(site, name, revision)
         if (result)
           reject(result);
         else
+        {
           resolve();
+
+          // Make sure that the popup is closed on Firefox Android,
+          // work-around for https://bugzil.la/1433604
+          browser.tabs.update({active: true});
+        }
       });
 
       browser.tabs.executeScript({