diff --git a/src/components/GuiGameList.cpp b/src/components/GuiGameList.cpp
index 6d6986017..c91d48ade 100644
--- a/src/components/GuiGameList.cpp
+++ b/src/components/GuiGameList.cpp
@@ -19,6 +19,8 @@ GuiGameList::GuiGameList(Window* window, bool useDetail) : GuiComponent(window),
 
 	mTheme = new ThemeComponent(mWindow, mDetailed);
 
+	mScreenshot = new ImageComponent(mWindow, getImagePos().x, getImagePos().y, "", (unsigned int)mTheme->getFloat("gameImageWidth"), (unsigned int)mTheme->getFloat("gameImageHeight"), false);
+
 	//The GuiGameList can use the older, simple game list if so desired.
 	//The old view only shows a list in the center of the screen; the new view can display an image and description.
 	//Those with smaller displays may prefer the older view.
@@ -26,17 +28,14 @@ GuiGameList::GuiGameList(Window* window, bool useDetail) : GuiComponent(window),
 	{
 		mList = new TextListComponent<FileData*>(mWindow, (int)(Renderer::getScreenWidth() * mTheme->getFloat("listOffsetX")), Renderer::getDefaultFont(Renderer::LARGE)->getHeight() + 2, Renderer::getDefaultFont(Renderer::MEDIUM));
 
-		mScreenshot = new ImageComponent(mWindow, getImagePos().x, getImagePos().y, "", (unsigned int)mTheme->getFloat("gameImageWidth"), (unsigned int)mTheme->getFloat("gameImageHeight"), false);
-		mScreenshot->setOrigin(mTheme->getFloat("gameImageOriginX"), mTheme->getFloat("gameImageOriginY"));
-
 		mImageAnimation = new AnimationComponent();
 		mImageAnimation->addChild(mScreenshot);
 	}else{
 		mList = new TextListComponent<FileData*>(mWindow, 0, Renderer::getDefaultFont(Renderer::LARGE)->getHeight() + 2, Renderer::getDefaultFont(Renderer::MEDIUM));
-		mScreenshot = NULL;
-		mImageAnimation = NULL;
 	}
 
+	mScreenshot->setOrigin(mTheme->getFloat("gameImageOriginX"), mTheme->getFloat("gameImageOriginY"));
+
 	mDescription.setOffset(Vector2i((int)(Renderer::getScreenWidth() * 0.03), mScreenshot->getOffset().y + mScreenshot->getSize().y + 12));
 	mDescription.setExtent(Vector2u((int)(Renderer::getScreenWidth() * (mTheme->getFloat("listOffsetX") - 0.03)), 0));
 	
@@ -58,11 +57,11 @@ GuiGameList::~GuiGameList()
 	//undo the parenting hack because otherwise it's not really a child and will try to remove itself on delete
 	mList->setParent(NULL);
 	delete mList;
+	delete mScreenshot;
 
 	if(mDetailed)
 	{
 		delete mImageAnimation;
-		delete mScreenshot;
 	}
 
 	delete mTheme;