diff --git a/src/js/tools/drawing/ColorSwap.js b/src/js/tools/drawing/ColorSwap.js
index cdf7b5e9..7c1f2817 100644
--- a/src/js/tools/drawing/ColorSwap.js
+++ b/src/js/tools/drawing/ColorSwap.js
@@ -56,8 +56,9 @@
   };
 
   ns.ColorSwap.prototype.applyToolOnFrame_ = function (frame, oldColor, newColor) {
+    oldColor = oldColor.toUpperCase();
     frame.forEachPixel(function (color, col, row) {
-      if (color == oldColor) {
+      if (color && color.toUpperCase() == oldColor) {
         frame.pixels[col][row] = newColor;
       }
     });