diff --git a/common/content/configbase.js b/common/content/configbase.js
index 150aa50e..e0af604e 100644
--- a/common/content/configbase.js
+++ b/common/content/configbase.js
@@ -218,6 +218,11 @@ const ConfigBase = Class(ModuleBase, {
         CompMore::after      content: "⌄";
         CompGroup:last-of-type  padding-bottom: 1.5ex;
 
+        EditorEditing;;*   background: #bbb !important; -moz-user-input: none; -moz-user-modify: read-only;
+        EditorError;;*     background: red !important;
+        EditorBlink1;;*    background: yellow !important;
+        EditorBlink2;;*
+
         Indicator   color: blue; width: 1.5em; text-align: center;
         Filter      font-weight: bold;
 
diff --git a/common/content/editor.js b/common/content/editor.js
index 3681a66d..5945f4fb 100644
--- a/common/content/editor.js
+++ b/common/content/editor.js
@@ -280,14 +280,16 @@ const Editor = Module("editor", {
             dactyl.assert(editor);
             text = Array.map(editor.rootElement.childNodes, function (e) util.domToString(e, true)).join("");
         }
-        let oldBg, tmpBg;
-        function cleanup(error) {
+
+        let origGroup = textBox && textBox.getAttributeNS(NS, "highlight") || "";
+        let cleanup = util.yieldable(function cleanup(error) {
             if (timer)
                 timer.cancel();
 
+            let blink = ["EditorBlink1", "EditorBlink2"];
             if (error) {
                 dactyl.reportError(error, true);
-                tmpBg = "red";
+                blink[1] = "EditorError";
             }
             else
                 dactyl.trapErrors(update, null, true);
@@ -295,19 +297,15 @@ const Editor = Module("editor", {
             if (tmpfile && tmpfile.exists())
                 tmpfile.remove(false);
 
-            if (textBox)
-                textBox.removeAttribute("readonly");
-
             // blink the textbox after returning
             if (textBox) {
-                let colors = [tmpBg, oldBg, tmpBg, oldBg];
-                (function next() {
-                    textBox.style.backgroundColor = colors.shift();
-                    if (colors.length > 0)
-                        util.timeout(next, 100);
-                })();
+                dactyl.focus(textBox);
+                for (let group in values(blink.concat(blink, ""))) {
+                    highlight.highlightNode(textBox, origGroup + " " + group);
+                    yield 100;
+                }
             }
-        }
+        });
 
         try {
             var tmpfile = io.createTempFile();
@@ -315,10 +313,8 @@ const Editor = Module("editor", {
                 throw Error("Couldn't create temporary file");
 
             if (textBox) {
-                textBox.setAttribute("readonly", "true");
-                oldBg = textBox.style.backgroundColor;
-                tmpBg = "yellow";
-                textBox.style.backgroundColor = "#bbbbbb";
+                highlight.highlightNode(textBox, origGroup + " EditorEditing");
+                textBox.blur();
             }
 
             if (!tmpfile.write(text))
diff --git a/common/modules/styles.jsm b/common/modules/styles.jsm
index ee523e4c..fc97680e 100644
--- a/common/modules/styles.jsm
+++ b/common/modules/styles.jsm
@@ -110,7 +110,7 @@ const Hive = Class("Hive", {
             sheet.sites = filter;
         }
         else {
-            sheet = Sheet(name, this._id++, filter.filter(util.identity), String(css), this, agent);
+            sheet = Sheet(name, styles._id++, filter.filter(util.identity), String(css), this, agent);
             this.sheets.push(sheet);
         }