diff --git a/src/app/file/gif_format.cpp b/src/app/file/gif_format.cpp
index 1f7527e26..5e568d50a 100644
--- a/src/app/file/gif_format.cpp
+++ b/src/app/file/gif_format.cpp
@@ -499,7 +499,7 @@ private:
   // original GIF frame colors with the current sprite colors.
   void updatePalette(const Image* frameImage) {
     ColorMapObject* colormap = getFrameColormap();
-    int ncolors = colormap->ColorCount;
+    const int ncolors = colormap->ColorCount;
     bool isLocalColormap = (m_gifFile->Image.ColorMap ? true: false);
 
     GIF_TRACE("GIF: Local colormap=%d, ncolors=%d\n", isLocalColormap, ncolors);
@@ -561,18 +561,31 @@ private:
     // sprite palette.
     int found = 0;
     if (m_frameNum > 0) {
-      for (int i=0; i<ncolors; ++i) {
-        if (!usedEntries[i])
-          continue;
+      ColorMapObject* globalCMap = m_gifFile->SColorMap;
+      ColorMapObject* localCMap = m_gifFile->Image.ColorMap;
+      if (globalCMap && !m_hasLocalColormaps)
+        found = usedEntries.size();
+      else {
+        for (int i=0; i<ncolors; ++i) {
+          if (!usedEntries[i])
+            continue;
 
-        int j = palette->findExactMatch(
-          colormap->Colors[i].Red,
-          colormap->Colors[i].Green,
-          colormap->Colors[i].Blue, 255,
-          (m_opaque ? -1: m_bgIndex));
-        if (j >= 0) {
-          m_remap.map(i, j);
-          ++found;
+          if (localCMap && i < localCMap->ColorCount &&
+              rgba(localCMap->Colors[i].Red,
+                   localCMap->Colors[i].Green,
+                   localCMap->Colors[i].Blue, 255) == palette->getEntry(i)) {
+            ++found;
+            continue;
+          }
+
+          int j = palette->findExactMatch(colormap->Colors[i].Red,
+                                          colormap->Colors[i].Green,
+                                          colormap->Colors[i].Blue, 255,
+                                          (m_opaque ? -1: m_bgIndex));
+          if (j >= 0) {
+            m_remap.map(i, j);
+            ++found;
+          }
         }
       }
     }