diff --git a/rpcs3/Gui/GameViewer.cpp b/rpcs3/Gui/GameViewer.cpp
index 337a44a9fb..f86d70c4db 100644
--- a/rpcs3/Gui/GameViewer.cpp
+++ b/rpcs3/Gui/GameViewer.cpp
@@ -269,8 +269,11 @@ void GameViewer::ConfigureGame(wxCommandEvent& WXUNUSED(event))
 
 void GameViewer::RemoveGame(wxCommandEvent& event)
 {
+	long i = GetFirstSelected();
+	if (i < 0) return;
+	
 	Emu.GetVFS().Init("/");
-	Emu.GetVFS().DeleteAll(m_path + "/" + this->GetItemText(event.GetId(), 6).ToStdString());
+	Emu.GetVFS().DeleteAll(m_path + "/" + this->GetItemText(i, 6).ToStdString());
 	Emu.GetVFS().UnMountAll();
 
 	Refresh();