diff --git a/Magazyn_Client/Magazyn/Windows/ErrorWindow.xaml b/Magazyn_Client/Magazyn/Windows/ErrorWindow.xaml
index 599811e..4a7c743 100644
--- a/Magazyn_Client/Magazyn/Windows/ErrorWindow.xaml
+++ b/Magazyn_Client/Magazyn/Windows/ErrorWindow.xaml
@@ -15,7 +15,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Magazyn.Windows"
         mc:Ignorable="d"
-        Title="Błąd" WindowStartupLocation="CenterOwner" Height="205" Width="220" ResizeMode="NoResize">
+        Title="Błąd" WindowStartupLocation="CenterOwner" Height="205" Width="220" ResizeMode="NoResize" Keyboard.KeyDown="Window_KeyDown">
 	<Grid>
 		<Button x:Name="okButton" Content="Ok" HorizontalAlignment="Right" Margin="0,0,10,10" VerticalAlignment="Bottom" Width="75" Click="okButton_Click"/>
 		<TextBlock x:Name="messageBlock" FontSize="16" Margin="10,10,10,0" TextWrapping="Wrap" Text="messageBlock" VerticalAlignment="Top"/>
diff --git a/Magazyn_Client/Magazyn/Windows/ErrorWindow.xaml.cs b/Magazyn_Client/Magazyn/Windows/ErrorWindow.xaml.cs
index fc75bc0..ffe8b53 100644
--- a/Magazyn_Client/Magazyn/Windows/ErrorWindow.xaml.cs
+++ b/Magazyn_Client/Magazyn/Windows/ErrorWindow.xaml.cs
@@ -29,5 +29,10 @@ namespace Magazyn.Windows
 		{
 			this.Close();
 		}
-	}
+
+        private void Window_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Return) this.Close();
+        }
+    }
 }
diff --git a/Magazyn_Client/Magazyn/Windows/InfoWindow.xaml b/Magazyn_Client/Magazyn/Windows/InfoWindow.xaml
index a627cc5..ce465fd 100644
--- a/Magazyn_Client/Magazyn/Windows/InfoWindow.xaml
+++ b/Magazyn_Client/Magazyn/Windows/InfoWindow.xaml
@@ -15,7 +15,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Magazyn.Windows"
         mc:Ignorable="d"
-        Title="Informacje o: " WindowStartupLocation="CenterOwner" Height="205" Width="220" ResizeMode="NoResize">
+        Title="Informacje o: " WindowStartupLocation="CenterOwner" Height="205" Width="220" ResizeMode="NoResize" Keyboard.KeyDown="Window_KeyDown">
     <Grid>
         <TextBlock x:Name="fruitName" Margin="79,10,9,0" TextWrapping="Wrap" Text="fruitName" Height="16" VerticalAlignment="Top"/>
         <TextBlock x:Name="fruitPrice" Margin="79,31,10,0" TextWrapping="Wrap" Text="fruitPrice" Height="16" VerticalAlignment="Top"/>
diff --git a/Magazyn_Client/Magazyn/Windows/InfoWindow.xaml.cs b/Magazyn_Client/Magazyn/Windows/InfoWindow.xaml.cs
index cb7de38..0234a90 100644
--- a/Magazyn_Client/Magazyn/Windows/InfoWindow.xaml.cs
+++ b/Magazyn_Client/Magazyn/Windows/InfoWindow.xaml.cs
@@ -49,5 +49,10 @@ namespace Magazyn.Windows
         {
             this.Close();
         }
+
+        private void Window_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Return) this.Close();
+        }
     }
 }
diff --git a/Magazyn_Client/Magazyn/Windows/ValueWindow.xaml b/Magazyn_Client/Magazyn/Windows/ValueWindow.xaml
index cb0402a..26be3a2 100644
--- a/Magazyn_Client/Magazyn/Windows/ValueWindow.xaml
+++ b/Magazyn_Client/Magazyn/Windows/ValueWindow.xaml
@@ -15,7 +15,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Magazyn.Windows"
         mc:Ignorable="d"
-        Title="Wartość magazynu" WindowStartupLocation="CenterOwner" Height="205" Width="220" ResizeMode="NoResize">
+        Title="Wartość magazynu" WindowStartupLocation="CenterOwner" Height="205" Width="220" ResizeMode="NoResize" Keyboard.KeyDown="Window_KeyDown">
     <Grid>
         <Button x:Name="okButton" Content="Ok" HorizontalAlignment="Right" Margin="0,0,10,10" VerticalAlignment="Bottom" Width="75" Click="okButton_Click"/>
         <TextBlock Margin="10,28,10,0" TextWrapping="Wrap" Text="Wartość magazynu to:" VerticalAlignment="Top" TextAlignment="Center" RenderTransformOrigin="0.495,1.734" />
diff --git a/Magazyn_Client/Magazyn/Windows/ValueWindow.xaml.cs b/Magazyn_Client/Magazyn/Windows/ValueWindow.xaml.cs
index 79c8666..d0d7483 100644
--- a/Magazyn_Client/Magazyn/Windows/ValueWindow.xaml.cs
+++ b/Magazyn_Client/Magazyn/Windows/ValueWindow.xaml.cs
@@ -29,5 +29,10 @@ namespace Magazyn.Windows
 		{
 			this.Close();
 		}
-	}
+
+        private void Window_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Return) this.Close();
+        }
+    }
 }