diff --git a/src/gui/GuiIconGrid.cpp b/src/gui/GuiIconGrid.cpp
index 2a81a24..6cadec9 100644
--- a/src/gui/GuiIconGrid.cpp
+++ b/src/gui/GuiIconGrid.cpp
@@ -375,11 +375,14 @@ void GuiIconGrid::OnGameTitleUpdated(gameInfo * info) {
             break;
         }
     }
-    containerMutex.unlock();
 
+    // keep the lock to delay the draw() until the image data is ready.
     if(container != NULL) {
         container->updateImageData();
     }
+
+    containerMutex.unlock();
+
     bUpdatePositions = true;
 }