diff --git a/Changes.txt b/Changes.txt
index ee314e21a..0ab5ba6db 100644
--- a/Changes.txt
+++ b/Changes.txt
@@ -23,6 +23,10 @@
     'cursor'.  The new argument allows to set mouse cursor visibility
     separately for both UI and emulation modes.
 
+  * Fixed snapshot bug most noticeable in MacOSX, where taking a snapshot
+    of a TIA image sometimes left parts of the UI onscreen (and in the
+    resulting picture).
+
   * Fixed memory leak; the game console wasn't being closed after exiting
     a ROM.
 
diff --git a/src/emucore/EventHandler.cxx b/src/emucore/EventHandler.cxx
index 3db192ed3..6c82ac372 100644
--- a/src/emucore/EventHandler.cxx
+++ b/src/emucore/EventHandler.cxx
@@ -1875,6 +1875,7 @@ void EventHandler::takeSnapshot(uInt32 number)
   {
     // Make sure we have a 'clean' image, with no onscreen messages
     myOSystem.frameBuffer().enableMessages(false);
+    myOSystem.frameBuffer().tiaSurface().render();
 
     string message = "Snapshot saved";
     try