diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs
index bb988f4b4..e639bbef9 100644
--- a/Flow.Launcher/MainWindow.xaml.cs
+++ b/Flow.Launcher/MainWindow.xaml.cs
@@ -64,7 +64,7 @@ namespace Flow.Launcher
         private void Timer_Tick(object sender, EventArgs e)
         {
             ClockBox.Text = System.DateTime.Now.ToString("tt hh:mm");
-            DateBox.Text = System.DateTime.Now.ToString("ddd MM/dd", CultureInfo.InvariantCulture);
+            DateBox.Text = System.DateTime.Now.ToString("MM/dd dddd");
 
         }
         private void OnCopy(object sender, ExecutedRoutedEventArgs e)
@@ -363,6 +363,7 @@ namespace Flow.Launcher
             _settings.WindowLeft = Left;
             _settings.WindowTop = Top;
             iconsb.Begin(SearchIcon);
+            iconsb.Begin(ClockPanel);
             sb.Begin(FlowMainWindow);
         }
 
diff --git a/Flow.Launcher/Themes/Base.xaml b/Flow.Launcher/Themes/Base.xaml
index 23388b78c..4126539a0 100644
--- a/Flow.Launcher/Themes/Base.xaml
+++ b/Flow.Launcher/Themes/Base.xaml
@@ -117,11 +117,16 @@
         x:Key="ClockPanel"
         BasedOn="{StaticResource BaseClockPanel}"
         TargetType="{x:Type StackPanel}">
+        <Setter Property="Margin" Value="0,0,62,0" />
         <Setter Property="Visibility" Value="Visible" />
         <Style.Triggers>
-            <DataTrigger Binding="{Binding ElementName=QueryTextBox, UpdateSourceTrigger=PropertyChanged, Path=Text.Length}" Value="0">
-
-                <DataTrigger.EnterActions>
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding ElementName=QueryTextBox, UpdateSourceTrigger=PropertyChanged, Path=Text.Length}" Value="0" />
+                    <Condition Binding="{Binding ElementName=ContextMenu, Path=Visibility}" Value="Collapsed" />
+                    <Condition Binding="{Binding ElementName=History, Path=Visibility}" Value="Collapsed" />
+                </MultiDataTrigger.Conditions>
+                <MultiDataTrigger.EnterActions>
                     <BeginStoryboard>
                         <Storyboard>
                             <DoubleAnimation
@@ -131,20 +136,20 @@
                                 Duration="0:0:0.2" />
                         </Storyboard>
                     </BeginStoryboard>
-                </DataTrigger.EnterActions>
-                <DataTrigger.ExitActions>
+                </MultiDataTrigger.EnterActions>
+                <MultiDataTrigger.ExitActions>
                     <BeginStoryboard>
                         <Storyboard>
                             <DoubleAnimation
                                 Storyboard.TargetProperty="Opacity"
-                                From="1.0"
                                 To="0.0"
                                 Duration="0:0:0.2" />
                         </Storyboard>
                     </BeginStoryboard>
-                </DataTrigger.ExitActions>
+                </MultiDataTrigger.ExitActions>
 
-            </DataTrigger>
+            </MultiDataTrigger>
+            <DataTrigger Binding="{Binding ElementName=QueryTextBox, UpdateSourceTrigger=PropertyChanged, Path=Text.Length}" Value="0" />
 
         </Style.Triggers>