diff --git a/Aosta.Ava/Aosta.Ava/Pages/LocalEpisodeDetailsPage.axaml b/Aosta.Ava/Aosta.Ava/Pages/LocalEpisodeDetailsPage.axaml
index 11a3a60..b77905d 100644
--- a/Aosta.Ava/Aosta.Ava/Pages/LocalEpisodeDetailsPage.axaml
+++ b/Aosta.Ava/Aosta.Ava/Pages/LocalEpisodeDetailsPage.axaml
@@ -28,17 +28,22 @@
         <local:AnimatedPopup Grid.Row="1"
                              Grid.ColumnSpan="1"
                              Name="NoteEditor"
-                             VerticalAlignment="Bottom"
+                             VerticalAlignment="Top"
                              HorizontalAlignment="Center"
                              AnimateWidth="False">
             <Border Padding="10,0,10,10"
+                    Margin="10,0"
                     CornerRadius="10"
                     Background="{DynamicResource FloatingPaneBackgroundBrush}"
                     Width="{Binding $parent[Grid].Bounds.Width}">
                 <Grid RowDefinitions="Auto,Auto,Auto"
-                      ColumnDefinitions="*,Auto">
+                      ColumnDefinitions="Auto,*,Auto">
+                    <TextBlock Text="{Binding NewNoteTimeValue, Converter={converters:TimeStringConverter}}"
+                               MinWidth="50"
+                               VerticalAlignment="Center"
+                               HorizontalAlignment="Left"/>
                     <Slider Grid.Row="0"
-                            Grid.Column="0"
+                            Grid.Column="1"
                             ToolTip.VerticalOffset="10"
                             ToolTip.Placement="Top"
                             ToolTip.Tip="{Binding NewNoteTimeValue, Converter={converters:TimeStringConverter}}"
@@ -51,7 +56,8 @@
                             IsVisible="{Binding Episode.Duration, Converter={converters:NullValueBoolConverter}}">
                     </Slider>
                     <Button Grid.Row="0"
-                            Grid.Column="1"
+                            Grid.Column="2"
+                            Tapped="InputElement_OnTapped"
                             Classes="accent"
                             VerticalAlignment="Center"
                             Command="{Binding AddNote}">
@@ -60,7 +66,7 @@
                     </Button>
                     <TextBox Grid.Row="1"
                              Grid.Column="0"
-                             Grid.ColumnSpan="2"
+                             Grid.ColumnSpan="3"
                              Watermark="{localize:Localize EpisodeDetails.Notes.TitleWatermark}"
                              Text="{Binding NewNoteTitle}"
                              MaxLines="1"
@@ -68,7 +74,7 @@
                              AcceptsTab="False" />
                     <TextBox Grid.Row="2"
                              Grid.Column="0"
-                             Grid.ColumnSpan="2"
+                             Grid.ColumnSpan="3"
                              Margin="0,10,0,0"
                              Watermark="{localize:Localize EpisodeDetails.Notes.NoteWatermark}"
                              Text="{Binding NewNoteText}"
diff --git a/Aosta.Ava/Aosta.Ava/Pages/LocalEpisodeDetailsPage.axaml.cs b/Aosta.Ava/Aosta.Ava/Pages/LocalEpisodeDetailsPage.axaml.cs
index 2785fac..b17b539 100644
--- a/Aosta.Ava/Aosta.Ava/Pages/LocalEpisodeDetailsPage.axaml.cs
+++ b/Aosta.Ava/Aosta.Ava/Pages/LocalEpisodeDetailsPage.axaml.cs
@@ -3,6 +3,7 @@
 
 using Aosta.Ava.ViewModels;
 
+using Avalonia.Input;
 using Avalonia.Interactivity;
 
 namespace Aosta.Ava.Pages;
@@ -26,4 +27,9 @@ protected override void OnLoaded(RoutedEventArgs e)
             MarkWatchedButton.IsVisible = false;
         };
     }
+
+    private void InputElement_OnTapped(object? sender, TappedEventArgs e)
+    {
+        NoteEditor.Close();
+    }
 }
diff --git a/Aosta.Ava/Aosta.Ava/ViewModels/LocalEpisodeDetailsViewModel.cs b/Aosta.Ava/Aosta.Ava/ViewModels/LocalEpisodeDetailsViewModel.cs
index c2ba6ba..44c53da 100644
--- a/Aosta.Ava/Aosta.Ava/ViewModels/LocalEpisodeDetailsViewModel.cs
+++ b/Aosta.Ava/Aosta.Ava/ViewModels/LocalEpisodeDetailsViewModel.cs
@@ -132,7 +132,7 @@ internal void DeleteNote(EpisodeNote note)
 
     private void addNote()
     {
-        _realm.WriteAsync(r => Episode.Notes.Add(new EpisodeNote
+        _realm.Write(r => Episode.Notes.Add(new EpisodeNote
         {
             PointInTime = TimeSpan.FromSeconds(NewNoteTimeValue),
             Title = NewNoteTitle,