diff --git a/Gavilya/Pages/GameInfoPage.xaml b/Gavilya/Pages/GameInfoPage.xaml
index a177c246..47c6a72d 100644
--- a/Gavilya/Pages/GameInfoPage.xaml
+++ b/Gavilya/Pages/GameInfoPage.xaml
@@ -306,6 +306,7 @@
 						</StackPanel>
 
 						<WrapPanel x:Name="AchievementsDisplayer" />
+						<uc:NoAchievementsItem x:Name="NoAchievements" Visibility="Collapsed"/>
 					</StackPanel>
 				</Grid>
 			</Grid>
diff --git a/Gavilya/Pages/GameInfoPage.xaml.cs b/Gavilya/Pages/GameInfoPage.xaml.cs
index f469911e..3986cb3b 100644
--- a/Gavilya/Pages/GameInfoPage.xaml.cs
+++ b/Gavilya/Pages/GameInfoPage.xaml.cs
@@ -434,10 +434,14 @@ private async void LoadAchievements()
 			{
 				AchievementsDisplayer.Children.Add(new AchievementItem(achievement)); // Add new achievement
 			}
+
+			NoAchievements.Visibility = Visibility.Collapsed;
+			AchievementsDisplayer.Visibility = Visibility.Visible;
 		}
 		else
 		{
-			AchievementsDisplayer.Children.Add(new NoAchievementsItem()); // Add a message
+			NoAchievements.Visibility = Visibility.Visible;
+			AchievementsDisplayer.Visibility = Visibility.Collapsed;
 		}
 	}