diff --git a/TODO b/TODO
index 2eeb02be2..cee86c242 100644
--- a/TODO
+++ b/TODO
@@ -6,6 +6,7 @@
  * Write automated test case for multi-draw APIs
  * Implement assertion code on iPhone
  * Add __WINDOWS__ in addition to __WIN32__
+ * Write test for fullscreen gamma to check X11 colormap handling
 
  * Check 1.2 revisions:
 	3554 - Need to resolve semantics for locking keys on different platforms
diff --git a/src/video/x11/SDL_x11window.c b/src/video/x11/SDL_x11window.c
index 475a510d7..cc6b9f5de 100644
--- a/src/video/x11/SDL_x11window.c
+++ b/src/video/x11/SDL_x11window.c
@@ -992,6 +992,13 @@ X11_SetWindowFullscreenViaWM(_THIS, SDL_Window * window, SDL_VideoDisplay * _dis
         }
         X11_SetNetWMState(_this, data->xwindow, flags);
     }
+
+	if( fullscreen ) {
+		XInstallColormap(display, data->colormap);
+	} else {
+		XUninstallColormap(display, data->colormap);
+	}
+
     XFlush(display);
 }