diff --git a/NEWS.txt b/NEWS.txt
index 2a7915e..fd44d81 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -19,6 +19,7 @@ the fill.
 Fixed a bug in calculating spacing around the plot (reported by
 timothytoe). Fixed a bug in finding max values for all-negative data
 sets. Prevent the possibility of eternal looping in tick calculations.
+Fixed a bug when borderWidth is set to 0 (reported by Rob/sanchothefat).
 
 
 Flot 0.4
diff --git a/jquery.flot.js b/jquery.flot.js
index cf4b4c1..a033c4d 100644
--- a/jquery.flot.js
+++ b/jquery.flot.js
@@ -860,8 +860,9 @@
                 ctx.strokeStyle = options.grid.color;
                 ctx.lineJoin = "round";
                 ctx.strokeRect(0, 0, plotWidth, plotHeight);
-                ctx.restore();
             }
+
+            ctx.restore();
         }
         
         function insertLabels() {