diff --git a/kandinsky/src/framebuffer.cpp b/kandinsky/src/framebuffer.cpp
index dc57762c5..d56768071 100644
--- a/kandinsky/src/framebuffer.cpp
+++ b/kandinsky/src/framebuffer.cpp
@@ -27,10 +27,18 @@ void KDFrameBuffer::pushRect(KDRect rect, const KDColor * pixels) {
 }
 
 void KDFrameBuffer::pushRectUniform(KDRect rect, KDColor color) {
-  for (KDCoordinate i=0; i<rect.width(); i++) {
-    for (KDCoordinate j=0; j<rect.height(); j++) {
-      *pixelAddress(rect.origin().translatedBy(KDPoint(i,j))) = color;
+  // Caution: this code is used very frequently
+  // It's worth optimizing!
+  KDColor * pixel = pixelAddress(rect.origin());
+  int lineDelta = m_size.width() - rect.width();
+  for (KDCoordinate j=0; j<rect.height(); j++) {
+    //KDColor * topLeftPixelAddress = pixelAddress(rect.origin().translatedBy(KDPoint(0,j)));
+    //*pixelAddress(rect.origin().translatedBy(KDPoint(i,j))) = color;
+    for (KDCoordinate i=0; i<rect.width(); i++) {
+      *pixel++ = color;
+      //*pixelAddress(rect.origin().translatedBy(KDPoint(i,j))) = color;
     }
+    pixel += lineDelta;
   }
 }