diff --git a/GBM/Forms/frmGameManager.vb b/GBM/Forms/frmGameManager.vb
index 282c3fc..b3a6a71 100644
--- a/GBM/Forms/frmGameManager.vb
+++ b/GBM/Forms/frmGameManager.vb
@@ -403,9 +403,19 @@ Public Class frmGameManager
         oList.Sort(AddressOf mgrCommon.CompareByListBoxItemByValue)
 
         lstGames.BeginUpdate()
-        lstGames.DataSource = oList
         lstGames.ValueMember = "Key"
         lstGames.DisplayMember = "Value"
+
+        'Due to a control bug with Mono we need to fill the list box differently on Linux
+        If mgrCommon.IsUnix Then
+            lstGames.Items.Clear()
+            For Each kp As KeyValuePair(Of String, String) In oList
+                lstGames.Items.Add(kp)
+            Next
+        Else
+            lstGames.DataSource = oList
+        End If
+
         lstGames.EndUpdate()
         lstGames.ClearSelected()
         IsLoading = False