diff --git a/InternetTest/InternetTest/Pages/WiFiPasswordsPage.xaml b/InternetTest/InternetTest/Pages/WiFiPasswordsPage.xaml
index 196a3e8..a0720a7 100644
--- a/InternetTest/InternetTest/Pages/WiFiPasswordsPage.xaml
+++ b/InternetTest/InternetTest/Pages/WiFiPasswordsPage.xaml
@@ -44,6 +44,7 @@
                 <ColumnDefinition Width="*" />
                 <ColumnDefinition Width="Auto" />
                 <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="Auto" />
             </Grid.ColumnDefinitions>
             <Border
                 Width="300"
@@ -96,11 +97,23 @@
                 </Grid>
             </Border>
             <Button
-                x:Name="ExportBtn"
+                x:Name="ShowBtn"
                 Grid.Column="2"
                 Margin="5"
                 Padding="5"
                 Background="Transparent"
+                Click="ShowBtn_Click"
+                Content="&#xF3FC;"
+                Cursor="Hand"
+                FontFamily="..\Fonts\#FluentSystemIcons-Regular"
+                Foreground="{DynamicResource Foreground1}"
+                Style="{DynamicResource ToolButton}" />
+            <Button
+                x:Name="ExportBtn"
+                Grid.Column="3"
+                Margin="5"
+                Padding="5"
+                Background="Transparent"
                 Click="ExportBtn_Click"
                 Content="&#xF1A5;"
                 Cursor="Hand"
@@ -109,7 +122,7 @@
                 Style="{DynamicResource ToolButton}" />
             <Button
                 x:Name="GetWiFiBtn"
-                Grid.Column="3"
+                Grid.Column="4"
                 Margin="5"
                 Padding="5"
                 Background="{DynamicResource LightAccent}"
diff --git a/InternetTest/InternetTest/Pages/WiFiPasswordsPage.xaml.cs b/InternetTest/InternetTest/Pages/WiFiPasswordsPage.xaml.cs
index 5cfcef7..e116256 100644
--- a/InternetTest/InternetTest/Pages/WiFiPasswordsPage.xaml.cs
+++ b/InternetTest/InternetTest/Pages/WiFiPasswordsPage.xaml.cs
@@ -42,6 +42,7 @@ namespace InternetTest.Pages;
 public partial class WiFiPasswordsPage : Page
 {
 	bool codeInjected = !Global.Settings.UseSynethia;
+	bool showKeys = false;
 	public WiFiPasswordsPage()
 	{
 		InitializeComponent();
@@ -53,7 +54,7 @@ public WiFiPasswordsPage()
 	private void InitUI()
 	{
 		TitleTxt.Text = $"{Properties.Resources.Commands} > {Properties.Resources.WifiPasswords}";
-		PlaceholderGrid.Children.Add(Placeholder); // Show the placeholder instead of an empty page
+		if (PlaceholderGrid.Children.Count == 0) PlaceholderGrid.Children.Add(Placeholder); // Show the placeholder instead of an empty page
 
 		try
 		{
@@ -128,6 +129,7 @@ internal async Task ExportWiFiNetworkInfo(string path, bool includePasswords)
 
 	internal void LoadWiFiInfo(string path)
 	{
+		WiFiItemDisplayer.Children.Clear();
 		string[] files = Directory.GetFiles(path);
 		for (int i = 0; i < files.Length; i++)
 		{
@@ -138,7 +140,7 @@ internal void LoadWiFiInfo(string path)
 
 			if (test != null)
 			{
-				WiFiItemDisplayer.Children.Add(new WiFiInfoItem(test));
+				WiFiItemDisplayer.Children.Add(new WiFiInfoItem(test, showKeys));
 			}
 			streamReader.Close();
 		}
@@ -238,4 +240,11 @@ private async void ExportWithoutPasswordBtn_Click(object sender, RoutedEventArgs
 			await ExportWiFiNetworkInfo(folderBrowserDialog.SelectedPath, false);
 		}
 	}
+
+	private void ShowBtn_Click(object sender, RoutedEventArgs e)
+	{
+		showKeys = !showKeys;
+		InitUI();
+		ShowBtn.Content = showKeys ? "\uF3F8" : "\uF3FC";
+    }
 }
diff --git a/InternetTest/InternetTest/UserControls/WiFiInfoItem.xaml.cs b/InternetTest/InternetTest/UserControls/WiFiInfoItem.xaml.cs
index d14def8..cd94e71 100644
--- a/InternetTest/InternetTest/UserControls/WiFiInfoItem.xaml.cs
+++ b/InternetTest/InternetTest/UserControls/WiFiInfoItem.xaml.cs
@@ -38,12 +38,13 @@ public partial class WiFiInfoItem : UserControl
 {
 	bool codeInjected = !Global.Settings.UseSynethia;
 	private WLANProfile WLANProfile { get; init; }
-	public WiFiInfoItem(WLANProfile profile)
+	public WiFiInfoItem(WLANProfile profile, bool showKey=false)
 	{
 		InitializeComponent();
 		WLANProfile = profile;
 
 		InitUI();
+		if (showKey) ShowKeyBtn_Click(this, null);
 	}
 
 	internal void InitUI()