diff --git a/common/content/commandline.js b/common/content/commandline.js
index 075e3810..ddc8b55a 100644
--- a/common/content/commandline.js
+++ b/common/content/commandline.js
@@ -12,6 +12,7 @@ var CommandWidgets = Class("CommandWidgets", {
     init: function () {
         let _status = "dactyl-statusline-field-";
 
+        XML.ignoreWhitespace = true;
         util.overlayWindow(window, {
             append: <e4x xmlns={XUL} xmlns:dactyl={NS}>
                 <window id={document.documentElement.id}>
@@ -166,10 +167,9 @@ var CommandWidgets = Class("CommandWidgets", {
         let fontSize = util.computedStyle(document.documentElement).fontSize;
         styles.registerSheet("resource://dactyl-skin/dactyl.css");
         styles.system.add("font-size", "dactyl://content/buffer.xhtml",
-                          "body { font-size: " + fontSize + "; }");
-    },
-    cleanup: function cleanup() {
-        styles.unregisterSheet("resource://dactyl-skin/dactyl.css");
+                          "body { font-size: " + fontSize + "; } \
+                           html|html > xul|scrollbar { visibility: collapse !important; }",
+                          true);
     },
     addElement: function (obj) {
         const self = this;
@@ -474,6 +474,9 @@ var CommandLine = Module("commandline", {
                 dactyl.trapErrors(callback, self, value != null ? value : commandline.command);
         }
     },
+    cleanup: function cleanup() {
+        styles.unregisterSheet("resource://dactyl-skin/dactyl.css");
+    },
 
     /**
      * Determines whether the command line should be visible.
diff --git a/common/content/dactyl.js b/common/content/dactyl.js
index d169299d..f05f893e 100644
--- a/common/content/dactyl.js
+++ b/common/content/dactyl.js
@@ -212,6 +212,7 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
                 bell: document.getElementById("dactyl-bell"),
                 strut: document.getElementById("dactyl-bell-strut")
             }
+            XML.ignoreWhitespace = true;
             if (!elems.bell)
                 util.overlayWindow(window, {
                     objects: elems,
diff --git a/common/content/statusline.js b/common/content/statusline.js
index 84bafca4..090366ed 100644
--- a/common/content/statusline.js
+++ b/common/content/statusline.js
@@ -39,6 +39,7 @@ var StatusLine = Module("statusline", {
             ]]>)({ padding: util.OS.isMacOSX ? "padding-right: 10px !important;" : "" }));
         }
 
+        XML.ignoreWhitespace = true;
         let _commandline = "if (window.dactyl) return dactyl.modules.commandline";
         let prepend = <e4x xmlns={XUL} xmlns:dactyl={NS}>
             <statusbar id="status-bar" highlight="StatusLine">
diff --git a/common/modules/addons.jsm b/common/modules/addons.jsm
index ed971c1c..f3778cff 100644
--- a/common/modules/addons.jsm
+++ b/common/modules/addons.jsm
@@ -83,14 +83,14 @@ var actions = {
     enable: {
         name: "exte[nable]",
         description: "Enable an extension",
-        action: function (addon) addon.userDisabled = false,
+        action: function (addon) { addon.userDisabled = false; },
         filter: function ({ item }) item.userDisabled,
         perm: "enable"
     },
     disable: {
         name: "extd[isable]",
         description: "Disable an extension",
-        action: function (addon) addon.userDisabled = true,
+        action: function (addon) { addon.userDisabled = true; },
         filter: function ({ item }) !item.userDisabled,
         perm: "disable"
     },
@@ -125,7 +125,7 @@ var actions = {
     toggle: {
         name: "extt[oggle]",
         description: "Toggle an extension's enabled status",
-        action: function (addon) addon.userDisabled = !addon.userDisabled
+        action: function (addon) { addon.userDisabled = !addon.userDisabled; }
     },
     update: {
         name: "extu[pdate]",
diff --git a/common/skin/dactyl.css b/common/skin/dactyl.css
index 43788990..df1c4cfe 100644
--- a/common/skin/dactyl.css
+++ b/common/skin/dactyl.css
@@ -187,7 +187,6 @@ statusbarpanel {
 .dactyl-completions,
 #dactyl-multiline-output,
 #dactyl-multiline-input {
-    overflow: hidden;
     background-color: white;
     color: black;
 }