diff --git a/Flow.Launcher/HotkeyControl2Dialog.xaml b/Flow.Launcher/HotkeyControl2Dialog.xaml
index c492d95ea..2eb62c419 100644
--- a/Flow.Launcher/HotkeyControl2Dialog.xaml
+++ b/Flow.Launcher/HotkeyControl2Dialog.xaml
@@ -26,7 +26,6 @@
         <!--  Window title and the keys in the hotkey  -->
         <Grid
             Grid.Row="0"
-            Grid.Column="0"
             Margin="26,12,26,0">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
@@ -40,14 +39,11 @@
                     Text="{Binding WindowTitle}"
                     TextAlignment="Left" />
                 <TextBlock
-                    Grid.Row="0"
                     FontSize="14"
                     Text="{DynamicResource hotkeyRegGuide}" />
             </StackPanel>
             <Border
                 Grid.Row="1"
-                Grid.Column="0"
-                Grid.ColumnSpan="2"
                 Width="450"
                 Height="100"
                 Margin="0,100,0,0"
@@ -84,8 +80,7 @@
             </Border>
         </Grid>
 
-        <!--  Action buttons to the right of the title and keys  -->
-
+        <!-- Warning message for when something went wrong with the new hotkey. -->
         <Border Grid.Row="1">
 
             <Border
@@ -124,8 +119,6 @@
         <!--  Action buttons at the bottom of the dialog  -->
         <Border
             Grid.Row="2"
-            Grid.Column="0"
-            Grid.ColumnSpan="2"
             Background="{DynamicResource PopupButtonAreaBGColor}"
             BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
             BorderThickness="0,1,0,0"
diff --git a/Flow.Launcher/HotkeyControl2Dialog.xaml.cs b/Flow.Launcher/HotkeyControl2Dialog.xaml.cs
index fc66c805e..d7aa7cea1 100644
--- a/Flow.Launcher/HotkeyControl2Dialog.xaml.cs
+++ b/Flow.Launcher/HotkeyControl2Dialog.xaml.cs
@@ -30,14 +30,11 @@ public partial class HotkeyControl2Dialog : ContentDialog
 
     public HotkeyControl2Dialog(string hotkey, string windowTitle = "")
     {
-        if (windowTitle == string.Empty)
+        WindowTitle = windowTitle switch
         {
-            WindowTitle = InternationalizationManager.Instance.GetTranslation("hotkeyRegTitle");
-        }
-        else 
-        {
-            WindowTitle = windowTitle;
-        }        
+            "" or null => InternationalizationManager.Instance.GetTranslation("hotkeyRegTitle"),
+            _ => windowTitle
+        };
         CurrentHotkey = new HotkeyModel(hotkey);
         SetKeysToDisplay(CurrentHotkey);
 
@@ -106,7 +103,7 @@ public partial class HotkeyControl2Dialog : ContentDialog
 
         if (tbMsg == null)
             return;
-        
+
         if (!CheckHotkeyAvailability(hotkey.Value, true))
         {
             tbMsg.Text = InternationalizationManager.Instance.GetTranslation("hotkeyUnavailable");