diff --git a/Wino.Mail/Dialogs/SignatureEditorDialog.xaml b/Wino.Mail/Dialogs/SignatureEditorDialog.xaml
index 7fb4b40d..cbe18e68 100644
--- a/Wino.Mail/Dialogs/SignatureEditorDialog.xaml
+++ b/Wino.Mail/Dialogs/SignatureEditorDialog.xaml
@@ -241,6 +241,8 @@
                 <AppBarButton
                     x:Name="LinkButton"
                     Width="48"
+                    Click="LinkButtonClicked"
+                    FrameworkElement.AllowFocusOnInteraction="True"
                     Label="Add HyperLink"
                     ToolTipService.ToolTip="Add HyperLink">
                     <AppBarButton.Flyout>
diff --git a/Wino.Mail/Dialogs/SignatureEditorDialog.xaml.cs b/Wino.Mail/Dialogs/SignatureEditorDialog.xaml.cs
index 189ef58f..1655d8ff 100644
--- a/Wino.Mail/Dialogs/SignatureEditorDialog.xaml.cs
+++ b/Wino.Mail/Dialogs/SignatureEditorDialog.xaml.cs
@@ -258,8 +258,9 @@ namespace Wino.Dialogs
         private async void LinkButtonClicked(object sender, RoutedEventArgs e)
         {
             // Get selected text from Quill.
-
             HyperlinkTextBox.Text = await TryGetSelectedTextAsync();
+
+            HyperlinkFlyout.ShowAt(LinkButton);
         }
 
         private async Task UpdateEditorThemeAsync()