diff --git a/src/modules/poweraccent/PowerAccent.Core/Tools/Calculation.cs b/src/modules/poweraccent/PowerAccent.Core/Tools/Calculation.cs
index 308dfd279f..4929af535b 100644
--- a/src/modules/poweraccent/PowerAccent.Core/Tools/Calculation.cs
+++ b/src/modules/poweraccent/PowerAccent.Core/Tools/Calculation.cs
@@ -20,7 +20,7 @@ namespace PowerAccent.Core.Tools
 
         public static Point GetRawCoordinatesFromPosition(Position position, Rect screen, Size window)
         {
-            int offset = 10;
+            int offset = 24;
 
             double pointX = position switch
             {
diff --git a/src/modules/poweraccent/PowerAccent.UI/Selector.xaml b/src/modules/poweraccent/PowerAccent.UI/Selector.xaml
index 83fd174741..951322b4fa 100644
--- a/src/modules/poweraccent/PowerAccent.UI/Selector.xaml
+++ b/src/modules/poweraccent/PowerAccent.UI/Selector.xaml
@@ -38,7 +38,7 @@
 
 
     </Window.Resources>
-    <Grid Margin="24,24,24,24">
+    <Grid>
         <Border
             HorizontalAlignment="Center"
             VerticalAlignment="Center"
diff --git a/src/modules/poweraccent/PowerAccent.UI/Selector.xaml.cs b/src/modules/poweraccent/PowerAccent.UI/Selector.xaml.cs
index 197733493c..caaffe6008 100644
--- a/src/modules/poweraccent/PowerAccent.UI/Selector.xaml.cs
+++ b/src/modules/poweraccent/PowerAccent.UI/Selector.xaml.cs
@@ -63,14 +63,18 @@ public partial class Selector : Window, IDisposable, INotifyPropertyChanged
     {
         CharacterNameVisibility = _powerAccent.ShowUnicodeDescription ? Visibility.Visible : Visibility.Collapsed;
 
-        this.Visibility = isActive ? Visibility.Visible : Visibility.Collapsed;
-
         if (isActive)
         {
             characters.ItemsSource = chars;
-            CenterWindow();
+            this.UpdateLayout(); // Required for filling the actual width/height before positioning.
+            SetWindowPosition();
+            Show();
             Microsoft.PowerToys.Telemetry.PowerToysTelemetry.Log.WriteEvent(new PowerAccent.Core.Telemetry.PowerAccentShowAccentMenuEvent());
         }
+        else
+        {
+            Hide();
+        }
     }
 
     private void MenuExit_Click(object sender, RoutedEventArgs e)
@@ -78,11 +82,10 @@ public partial class Selector : Window, IDisposable, INotifyPropertyChanged
         Application.Current.Shutdown();
     }
 
-    private void CenterWindow()
+    private void SetWindowPosition()
     {
-        UpdateLayout();
-        Size window = new (((System.Windows.Controls.Panel)Application.Current.MainWindow.Content).ActualWidth, ((System.Windows.Controls.Panel)Application.Current.MainWindow.Content).ActualHeight);
-        Point position = _powerAccent.GetDisplayCoordinates(window);
+        Size windowSize = new (((System.Windows.Controls.Panel)Application.Current.MainWindow.Content).ActualWidth, ((System.Windows.Controls.Panel)Application.Current.MainWindow.Content).ActualHeight);
+        Point position = _powerAccent.GetDisplayCoordinates(windowSize);
         this.Left = position.X;
         this.Top = position.Y;
     }