diff --git a/content/treestyletab/res/fullScreenCanvas.xul b/content/treestyletab/res/fullScreenCanvas.xul
index 82e1d0c3..d0586a43 100644
--- a/content/treestyletab/res/fullScreenCanvas.xul
+++ b/content/treestyletab/res/fullScreenCanvas.xul
@@ -23,6 +23,7 @@ window.addEventListener('DOMContentLoaded', function() {
 	window.fullScreenCanvas = {
 		show : function() 
 		{
+			var color = '-moz-field';
 			var canvas = this.canvas;
 
 			var w = window.innerWidth;
@@ -38,7 +39,7 @@ window.addEventListener('DOMContentLoaded', function() {
 				var ctx = canvas.getContext("2d");
 				ctx.clearRect(0, 0, w, h);
 				ctx.save();
-				ctx.drawWindow(window, 0, 0, w, h, "rgb(255,255,255)");
+				ctx.drawWindow(window, 0, 0, w, h, color);
 				ctx.restore();
 
 				var browsers = [this.browser];
@@ -80,7 +81,7 @@ window.addEventListener('DOMContentLoaded', function() {
 					}
 					ctx.save();
 					ctx.translate(x, y);
-					ctx.drawWindow(frame, dx+frame.scrollX, dy+frame.scrollY, w, h, "rgb(255,255,255)");
+					ctx.drawWindow(frame, dx+frame.scrollX, dy+frame.scrollY, w, h, color);
 					ctx.restore();
 				});
 
diff --git a/content/treestyletab/treestyletabbrowser.js b/content/treestyletab/treestyletabbrowser.js
index 3cf3136e..9c55a021 100644
--- a/content/treestyletab/treestyletabbrowser.js
+++ b/content/treestyletab/treestyletabbrowser.js
@@ -2772,7 +2772,7 @@ TreeStyleTabBrowser.prototype = {
 		}
 		this.redrawContentArea();
 		window.setTimeout(function(aSelf) {
-			if (aSelf.tabbarShown) {
+			if (!aSelf.isGecko18 && aSelf.tabbarShown) {
 				b.removeAttribute(aSelf.kAUTOHIDE);
 				aSelf.redrawContentArea();
 			}