diff --git a/Flow.Launcher/CustomQueryHotkeySetting.xaml b/Flow.Launcher/CustomQueryHotkeySetting.xaml
index 23bd89906..e9d486fe1 100644
--- a/Flow.Launcher/CustomQueryHotkeySetting.xaml
+++ b/Flow.Launcher/CustomQueryHotkeySetting.xaml
@@ -1,57 +1,126 @@
-<Window x:Class="Flow.Launcher.CustomQueryHotkeySetting"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:flowlauncher="clr-namespace:Flow.Launcher"
-        Icon="Images\app.png"
-        ResizeMode="NoResize"
-        WindowStartupLocation="CenterScreen"
-        MouseDown="window_MouseDown"
-        Title="{DynamicResource customeQueryHotkeyTitle}" Height="345" Width="500" Background="#F3F3F3" BorderBrush="#cecece">
+<Window
+    x:Class="Flow.Launcher.CustomQueryHotkeySetting"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:flowlauncher="clr-namespace:Flow.Launcher"
+    Title="{DynamicResource customeQueryHotkeyTitle}"
+    Width="500"
+    Height="345"
+    Background="#F3F3F3"
+    BorderBrush="#cecece"
+    Icon="Images\app.png"
+    MouseDown="window_MouseDown"
+    ResizeMode="NoResize"
+    WindowStartupLocation="CenterScreen">
     <Window.InputBindings>
-        <KeyBinding Key="Escape" Command="Close"/>
+        <KeyBinding Key="Escape" Command="Close" />
     </Window.InputBindings>
     <Window.CommandBindings>
-        <CommandBinding Command="Close" Executed="cmdEsc_OnPress"/>
+        <CommandBinding Command="Close" Executed="cmdEsc_OnPress" />
     </Window.CommandBindings>
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition />
-            <RowDefinition Height="80"/>
+            <RowDefinition Height="80" />
         </Grid.RowDefinitions>
-        <Border BorderThickness="0 0 0 1" BorderBrush="#e5e5e5" Background="#ffffff" Padding="26 26 26 0">
+        <Border
+            Padding="26,26,26,0"
+            Background="#ffffff"
+            BorderBrush="#e5e5e5"
+            BorderThickness="0,0,0,1">
             <Grid>
                 <StackPanel>
-                    <StackPanel Grid.Row="0" Margin="0 0 0 12">
-                        <TextBlock Grid.Column="0" Text="{DynamicResource customeQueryHotkeyTitle}"  FontSize="20" FontWeight="SemiBold" FontFamily="Segoe UI" TextAlignment="Left"
-                                       Margin="0 0 0 0" />
+                    <StackPanel Grid.Row="0" Margin="0,0,0,12">
+                        <TextBlock
+                            Grid.Column="0"
+                            Margin="0,0,0,0"
+                            FontFamily="Segoe UI"
+                            FontSize="20"
+                            FontWeight="SemiBold"
+                            Text="{DynamicResource customeQueryHotkeyTitle}"
+                            TextAlignment="Left" />
                     </StackPanel>
                     <StackPanel>
-                        <TextBlock 
-                           Text="{DynamicResource customeQueryHotkeyTips}" Foreground="#1b1b1b" FontSize="14" TextWrapping="WrapWithOverflow" TextAlignment="Left"/>
+                        <TextBlock
+                            FontSize="14"
+                            Foreground="#1b1b1b"
+                            Text="{DynamicResource customeQueryHotkeyTips}"
+                            TextAlignment="Left"
+                            TextWrapping="WrapWithOverflow" />
                     </StackPanel>
 
-                    <StackPanel Orientation="Horizontal" Margin="0 20 0 0">
-                        <TextBlock Margin="10" FontSize="14" Grid.Row="0" Grid.Column="0" VerticalAlignment="Center"
-                   HorizontalAlignment="Left" Text="{DynamicResource hotkey}" Width="60"/>
-                        <flowlauncher:HotkeyControl x:Name="ctlHotkey" Margin="10,0,10,0" Grid.Column="1" VerticalAlignment="Center" Height="32" HorizontalAlignment="Left" HorizontalContentAlignment="Left" Width="200"/>
-                        <TextBlock Margin="10" FontSize="14" Grid.Row="1" Grid.Column="0" VerticalAlignment="Center"
-                   HorizontalAlignment="Left" Text="{DynamicResource actionKeyword}" />
+                    <StackPanel Margin="0,20,0,0" Orientation="Horizontal">
+                        <TextBlock
+                            Grid.Row="0"
+                            Grid.Column="0"
+                            Width="60"
+                            Margin="10"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            FontSize="14"
+                            Text="{DynamicResource hotkey}" />
+                        <flowlauncher:HotkeyControl
+                            x:Name="ctlHotkey"
+                            Grid.Column="1"
+                            Width="200"
+                            Height="32"
+                            Margin="10,0,10,0"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            HorizontalContentAlignment="Left" />
+                        <TextBlock
+                            Grid.Row="1"
+                            Grid.Column="0"
+                            Margin="10"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            FontSize="14"
+                            Text="{DynamicResource actionKeyword}" />
                     </StackPanel>
 
-                    <StackPanel Orientation="Horizontal" Margin="0 0 0 0">
-                        <TextBlock Margin="10" FontSize="14" Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" Width="60"
-                   HorizontalAlignment="Left" Text="{DynamicResource customQuery}" />
-                        <TextBox x:Name="tbAction" Margin="10" Width="250" VerticalAlignment="Center" HorizontalAlignment="Left" />
-                        <Button x:Name="btnTestActionKeyword" Padding="10 5 10 5" Height="30" Click="BtnTestActionKeyword_OnClick"
-                    Content="{DynamicResource preview}" />
+                    <StackPanel Margin="0,0,0,0" Orientation="Horizontal">
+                        <TextBlock
+                            Grid.Row="0"
+                            Grid.Column="0"
+                            Width="60"
+                            Margin="10"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            FontSize="14"
+                            Text="{DynamicResource customQuery}" />
+                        <TextBox
+                            x:Name="tbAction"
+                            Width="250"
+                            Margin="10"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center" />
+                        <Button
+                            x:Name="btnTestActionKeyword"
+                            Height="30"
+                            Padding="10,5,10,5"
+                            Click="BtnTestActionKeyword_OnClick"
+                            Content="{DynamicResource preview}" />
                     </StackPanel>
                 </StackPanel>
             </Grid>
         </Border>
-        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Grid.Row="1">
-            <Button x:Name="btnCancel" Click="BtnCancel_OnClick" Margin="10 0 5 0" Width="100" Height="32"
-                    Content="{DynamicResource cancel}" />
-            <Button x:Name="btnAdd" Margin="5 0 10 0" Width="100" Height="32" Click="btnAdd_OnClick">
+        <StackPanel
+            Grid.Row="1"
+            HorizontalAlignment="Center"
+            Orientation="Horizontal">
+            <Button
+                x:Name="btnCancel"
+                Width="100"
+                Height="32"
+                Margin="10,0,5,0"
+                Click="BtnCancel_OnClick"
+                Content="{DynamicResource cancel}" />
+            <Button
+                x:Name="btnAdd"
+                Width="100"
+                Height="32"
+                Margin="5,0,10,0"
+                Click="btnAdd_OnClick">
                 <TextBlock x:Name="lblAdd" Text="{DynamicResource done}" />
             </Button>
         </StackPanel>
diff --git a/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs b/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs
index 0109474e1..e1f69d117 100644
--- a/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs
+++ b/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs
@@ -92,6 +92,7 @@ namespace Flow.Launcher
         {
             App.API.ChangeQuery(tbAction.Text);
             Application.Current.MainWindow.Visibility = Visibility.Visible;
+            Application.Current.MainWindow.Opacity = 1;
             Application.Current.MainWindow.Focus();
 
         }
diff --git a/Flow.Launcher/Helper/HotKeyMapper.cs b/Flow.Launcher/Helper/HotKeyMapper.cs
index fe25ecf18..70d71bb32 100644
--- a/Flow.Launcher/Helper/HotKeyMapper.cs
+++ b/Flow.Launcher/Helper/HotKeyMapper.cs
@@ -78,7 +78,7 @@ namespace Flow.Launcher.Helper
                 if (mainViewModel.ShouldIgnoreHotkeys())
                     return;
 
-                mainViewModel.MainWindowVisibility = Visibility.Visible;
+                mainViewModel.Show();
                 mainViewModel.ChangeQueryText(hotkey.ActionKeyword, true);
             });
         }