diff --git a/common/content/completion.js b/common/content/completion.js
index bfc8afa2..495693a6 100644
--- a/common/content/completion.js
+++ b/common/content/completion.js
@@ -273,7 +273,7 @@ const CompletionContext = Class("CompletionContext", {
     get completions() this._completions || [],
     set completions(items) {
         // Accept a generator
-        if (!isArray(items))
+        if (!(isArray(items) || isArray(items.__proto__)))
             items = [x for (x in Iterator(items || []))];
         if (this._completions !== items) {
             delete this.cache.filtered;
diff --git a/common/content/editor.js b/common/content/editor.js
index b737a93a..a10e22bb 100644
--- a/common/content/editor.js
+++ b/common/content/editor.js
@@ -303,9 +303,7 @@ const Editor = Module("editor", {
         if (!options["editor"])
             return;
 
-        let textBox = null;
-        if (!(config.isComposeWindow))
-            textBox = dactyl.focus;
+        let textBox = config.isComposeWindow ? null : dactyl.focus;
 
         if (!forceEditing && textBox && textBox.type == "password") {
             commandline.input("Editing a password field externally will reveal the password. Would you like to continue? (yes/[no]): ",