--- a/src/video/x11/SDL_x11window.c	Thu Oct 11 14:42:49 2012 -0700
+++ b/src/video/x11/SDL_x11window.c	Thu Oct 11 14:43:13 2012 -0700
@@ -993,11 +993,13 @@
         X11_SetNetWMState(_this, data->xwindow, flags);
     }
 
-	if( fullscreen ) {
-		XInstallColormap(display, data->colormap);
-	} else {
-		XUninstallColormap(display, data->colormap);
-	}
+    if (data->visual->class == DirectColor) {
+        if ( fullscreen ) {
+            XInstallColormap(display, data->colormap);
+        } else {
+            XUninstallColormap(display, data->colormap);
+        }
+    }
 
     XFlush(display);
 }