diff --git a/ModernKeePass/Actions/CloseFlyoutAction.cs b/ModernKeePass/Actions/CloseFlyoutAction.cs
new file mode 100644
index 0000000..66a2448
--- /dev/null
+++ b/ModernKeePass/Actions/CloseFlyoutAction.cs
@@ -0,0 +1,17 @@
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Microsoft.Xaml.Interactivity;
+
+namespace ModernKeePass.Actions
+{
+    public class CloseFlyoutAction : DependencyObject, IAction
+    {
+        public object Execute(object sender, object parameter)
+        {
+            var flyout = sender as Flyout;
+            flyout?.Hide();
+
+            return null;
+        }
+    }
+}
diff --git a/ModernKeePass/ModernKeePass.csproj b/ModernKeePass/ModernKeePass.csproj
index 9307e7a..bf7ce38 100644
--- a/ModernKeePass/ModernKeePass.csproj
+++ b/ModernKeePass/ModernKeePass.csproj
@@ -107,6 +107,7 @@
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="Actions\CloseFlyoutAction.cs" />
     <Compile Include="Actions\SetupFocusAction.cs" />
     <Compile Include="App.xaml.cs">
       <DependentUpon>App.xaml</DependentUpon>
diff --git a/ModernKeePass/Pages/EntryDetailPage.xaml b/ModernKeePass/Pages/EntryDetailPage.xaml
index 9f3777f..21d2945 100644
--- a/ModernKeePass/Pages/EntryDetailPage.xaml
+++ b/ModernKeePass/Pages/EntryDetailPage.xaml
@@ -6,6 +6,8 @@
     xmlns:viewModels="using:ModernKeePass.ViewModels"
     xmlns:converters="using:ModernKeePass.Converters" 
     xmlns:local="using:ModernKeePass.Controls"
+    xmlns:Interactivity="using:Microsoft.Xaml.Interactivity" xmlns:Core="using:Microsoft.Xaml.Interactions.Core"
+    xmlns:Actions="using:ModernKeePass.Actions"
     x:Name="PageRoot"
     x:Class="ModernKeePass.Pages.EntryDetailPage"
     mc:Ignorable="d">
@@ -315,7 +317,7 @@
                                 Visibility="Collapsed"
                                 FontSize="{TemplateBinding FontSize}"
                                 VerticalAlignment="Stretch"/>
-                            <Button x:Name="GeneratorButton"
+                            <Button
                                 Grid.Row="1"
                                 Style="{StaticResource GeneratorButtonStyle}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
@@ -325,20 +327,28 @@
                                 FontSize="{TemplateBinding FontSize}"
                                 VerticalAlignment="Stretch" >
                                 <Button.Flyout>
-                                    <Flyout>
+                                    <Flyout x:Name="GenerateButtonFlyout">
+                                        <Interactivity:Interaction.Behaviors>
+                                            <Core:DataTriggerBehavior Binding="{Binding Password}" ComparisonCondition="NotEqual" Value="" >
+                                                <Actions:CloseFlyoutAction />
+                                            </Core:DataTriggerBehavior>
+                                        </Interactivity:Interaction.Behaviors>
                                         <StackPanel>
-                                            <TextBlock>Password Length:</TextBlock>
+                                            <TextBlock>
+                                                <Run Text="Password Length:"/>
+                                            </TextBlock>
                                             <Slider Value="{Binding PasswordLength, Mode=TwoWay}" Margin="0,-10,0,-20" />
-                                            <CheckBox IsChecked="{Binding UpperCasePatternSelected, Mode=TwoWay}">Upper case (A, B, C, ...)</CheckBox>
-                                            <CheckBox IsChecked="{Binding LowerCasePatternSelected, Mode=TwoWay}">Lower case (a, b, c, ...)</CheckBox>
-                                            <CheckBox IsChecked="{Binding DigitsPatternSelected, Mode=TwoWay}">Digits (0, 1, 2, ...)</CheckBox>
-                                            <CheckBox IsChecked="{Binding MinusPatternSelected, Mode=TwoWay}">Minus (-)</CheckBox>
-                                            <CheckBox IsChecked="{Binding UnderscorePatternSelected, Mode=TwoWay}">Underscore (_)</CheckBox>
-                                            <CheckBox IsChecked="{Binding SpacePatternSelected, Mode=TwoWay}">Space ( )</CheckBox>
-                                            <CheckBox IsChecked="{Binding SpecialPatternSelected, Mode=TwoWay}">Special (!, $, %, ...)</CheckBox>
-                                            <CheckBox IsChecked="{Binding BracketsPatternSelected, Mode=TwoWay}">Brackets ([], {}, (), ...)</CheckBox>
-                                            <Button Click="PasswordGenerationButton_Click">Generate</Button>
+                                            <CheckBox IsChecked="{Binding UpperCasePatternSelected, Mode=TwoWay}" Content="Upper case (A, B, C, ...)"/>
+                                            <CheckBox IsChecked="{Binding LowerCasePatternSelected, Mode=TwoWay}" Content="Lower case (a, b, c, ...)"/>
+                                            <CheckBox IsChecked="{Binding DigitsPatternSelected, Mode=TwoWay}" Content="Digits (0, 1, 2, ...)"/>
+                                            <CheckBox IsChecked="{Binding MinusPatternSelected, Mode=TwoWay}" Content="Minus (-)"/>
+                                            <CheckBox IsChecked="{Binding UnderscorePatternSelected, Mode=TwoWay}" Content="Underscore (_)"/>
+                                            <CheckBox IsChecked="{Binding SpacePatternSelected, Mode=TwoWay}" Content="Space ( )"/>
+                                            <CheckBox IsChecked="{Binding SpecialPatternSelected, Mode=TwoWay}" Content="Special (!, $, %, ...)"/>
+                                            <CheckBox IsChecked="{Binding BracketsPatternSelected, Mode=TwoWay}" Content="Brackets ([], {}, (), ...)"/>
+                                            <Button Click="PasswordGenerationButton_Click" Content="Generate"/>
                                         </StackPanel>
+
                                     </Flyout>
                                 </Button.Flyout>
                             </Button>
@@ -384,15 +394,15 @@
             <local:TextBoxWithButton x:Name="UrlTextBox" HorizontalAlignment="Left" Text="{Binding Url, Mode=TwoWay}" Height="32" Width="350" MaxLength="256" Style="{StaticResource TextBoxWithButtonStyle}" GotoClick="UrlButton_Click" />
             <TextBlock TextWrapping="Wrap" Text="Notes" FontSize="18"/>
             <TextBox HorizontalAlignment="Left" TextWrapping="Wrap" Text="{Binding Notes, Mode=TwoWay}" Width="350" Height="200" AcceptsReturn="True" IsSpellCheckEnabled="True" />
-            <CheckBox FontSize="18" IsChecked="{Binding HasExpirationDate, Mode=TwoWay}">Expiration date</CheckBox>
+            <CheckBox FontSize="18" IsChecked="{Binding HasExpirationDate, Mode=TwoWay}" Content="Expiration date"/>
             <StackPanel Orientation="Horizontal" IsHitTestVisible="{Binding HasExpirationDate}">
                 <SymbolIcon Symbol="Important" Foreground="DarkRed" Visibility="{Binding HasExpired, Converter={StaticResource BooleanToVisibilityConverter}}">
                     <ToolTipService.ToolTip>
                         <ToolTip Content="Password has expired" />
                     </ToolTipService.ToolTip>
                 </SymbolIcon>
-                <DatePicker Margin="0,0,20,0" Date="{Binding ExpiryDate, Mode=TwoWay}" ></DatePicker>
-                <TimePicker Time="{Binding ExpiryTime, Mode=TwoWay}"></TimePicker>
+                <DatePicker Margin="0,0,20,0" Date="{Binding ExpiryDate, Mode=TwoWay}" />
+                <TimePicker Time="{Binding ExpiryTime, Mode=TwoWay}"/>
             </StackPanel>
         </StackPanel>
 
@@ -426,4 +436,4 @@
             </CommandBar>
         </Grid>
     </Grid>
-</Page>
+</Page>
\ No newline at end of file
diff --git a/ModernKeePass/Pages/EntryDetailPage.xaml.cs b/ModernKeePass/Pages/EntryDetailPage.xaml.cs
index f262d2a..b0d5da4 100644
--- a/ModernKeePass/Pages/EntryDetailPage.xaml.cs
+++ b/ModernKeePass/Pages/EntryDetailPage.xaml.cs
@@ -7,7 +7,6 @@ using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Navigation;
 using ModernKeePass.Common;
 using ModernKeePass.ViewModels;
-using ModernKeePassLib.Cryptography.PasswordGenerator;
 
 // Pour en savoir plus sur le modèle d'élément Page Détail de l'élément, consultez la page http://go.microsoft.com/fwlink/?LinkId=234232
 
@@ -118,8 +117,6 @@ namespace ModernKeePass.Pages
         private void PasswordGenerationButton_Click(object sender, RoutedEventArgs e)
         {
             Model.GeneratePassword();
-            /*var button = (Button)sender;
-            button?.Flyout?.Hide();*/
         }
     }
 }