diff --git a/rpcs3/Gui/GameViewer.cpp b/rpcs3/Gui/GameViewer.cpp
index c57efd12c8..7f79afc6cf 100644
--- a/rpcs3/Gui/GameViewer.cpp
+++ b/rpcs3/Gui/GameViewer.cpp
@@ -26,14 +26,14 @@ void GameViewer::DoResize(wxSize size)
 	SetSize(size);
 }
 
-int wxCALLBACK ListItemCompare(long item1, long item2, long sortinfo) 
+int wxCALLBACK ListItemCompare(wxIntPtr item1, wxIntPtr item2, wxIntPtr sortinfo)
 {
 	ListSortInfo *SortInfo = (ListSortInfo *)sortinfo;
 	int Column = SortInfo->Column;
 	GameViewer *pGameViewer = SortInfo->GameViewerCtrl; 
 	bool SortAscending = SortInfo->SortAscending; 
-	long index1 = pGameViewer->FindItem(0, item1);  
-	long index2 = pGameViewer->FindItem(0, item2);  
+	long index1 = pGameViewer->FindItem(-1, item1);  
+	long index2 = pGameViewer->FindItem(-1, item2);  
 	wxString string1 = pGameViewer->GetItemText(index1, Column); 
 	wxString string2 = pGameViewer->GetItemText(index2, Column); 
 
@@ -65,6 +65,7 @@ void GameViewer::OnColClick(wxListEvent& event)
 	SortInfo.Column = event.GetColumn();
 	SortInfo.GameViewerCtrl = this;  
 	SortItems(ListItemCompare, (long)&SortInfo);  
+
 }
 
 
diff --git a/rpcs3/Gui/GameViewer.h b/rpcs3/Gui/GameViewer.h
index e14d5b4f1e..85457bdc6b 100644
--- a/rpcs3/Gui/GameViewer.h
+++ b/rpcs3/Gui/GameViewer.h
@@ -140,8 +140,13 @@ public:
 
 			for(u32 i=0; i<col->data.size(); ++i)
 			{
-				if(list->GetItemCount() <= (int)i) list->InsertItem(i, wxEmptyString);
+				if (list->GetItemCount() <= (int)i)
+				{
+					list->InsertItem(i, wxEmptyString);
+					list->SetItemData(i, i);
+				}
 				list->SetItem(i, c, fmt::FromUTF8(col->data[i]));
+
 			}			
 		}
 	}