diff --git a/src/background.js b/src/background.js
index 87fc0456402..3c2b9256183 100644
--- a/src/background.js
+++ b/src/background.js
@@ -198,6 +198,11 @@ var bg_isBackground = true,
                     bg_passwordGenerationService.addHistory(password);
                 });
             }
+            else if (info.menuItemId === 'autofill_noop') {
+                if (bg_utilsService.isFirefox() && chrome.browserAction.openPopup) {
+                    chrome.browserAction.openPopup();
+                }
+            }
             else if (info.parentMenuItemId === 'autofill' || info.parentMenuItemId === 'copy-username' ||
                 info.parentMenuItemId === 'copy-password') {
                 var id = info.menuItemId.split('_')[1];
diff --git a/src/services/cryptoService.js b/src/services/cryptoService.js
index 90b70a0bfb1..e5dd74bfc70 100644
--- a/src/services/cryptoService.js
+++ b/src/services/cryptoService.js
@@ -31,7 +31,7 @@ function initCryptoService(constantsService) {
             }
 
             return self.utilsService.saveObjToStorage(keyKey, key.keyB64);
-        })
+        });
     };
 
     CryptoService.prototype.setKeyHash = function (keyHash, callback) {