diff --git a/src/ui/heat_map_element_canvas.js b/src/ui/heat_map_element_canvas.js
index fc80a4d..6b2e017 100644
--- a/src/ui/heat_map_element_canvas.js
+++ b/src/ui/heat_map_element_canvas.js
@@ -429,16 +429,16 @@ morpheus.HeatMapElementCanvas.prototype = {
                   cellRowSize -= 2;
                   cellColumnSize -= 2;
                 }
-                var x = px + xoffset + cellRowSize / 2;
-                var y = py + yoffset + cellColumnSize / 2;
+                var x = px + xoffset + cellColumnSize / 2;
+                var y = py + yoffset + cellRowSize / 2;
                 morpheus.CanvasUtil.drawShape(context, condition.shape,
                   x, y, Math.min(cellColumnSize, cellRowSize) / 2, true);
               } else { // e.g. filled circle on top of heat map
                 drawFunction(px + xoffset, py + yoffset, cellColumnSize,
                   cellRowSize);
                 // x and y are at center
-                var x = px + xoffset + cellRowSize / 2;
-                var y = py + yoffset + cellColumnSize / 2;
+                var x = px + xoffset + cellColumnSize / 2;
+                var y = py + yoffset + cellRowSize / 2;
                 context.fillStyle = condition.color;
                 morpheus.CanvasUtil.drawShape(context, condition.shape,
                   x, y, Math.min(cellColumnSize, cellRowSize) / 4, true);