diff --git a/Dalamud/Interface/Internal/Windows/BranchSwitcherWindow.cs b/Dalamud/Interface/Internal/Windows/BranchSwitcherWindow.cs
index bdff07e3e..7f5f83bc0 100644
--- a/Dalamud/Interface/Internal/Windows/BranchSwitcherWindow.cs
+++ b/Dalamud/Interface/Internal/Windows/BranchSwitcherWindow.cs
@@ -31,8 +31,8 @@ public class BranchSwitcherWindow : Window
     public BranchSwitcherWindow()
         : base("Branch Switcher", ImGuiWindowFlags.AlwaysAutoResize)
     {
-        this.ShowCloseButton = false;
-        this.RespectCloseHotkey = false;
+        this.ShowCloseButton = true;
+        this.RespectCloseHotkey = true;
     }
 
     /// <inheritdoc/>
@@ -95,6 +95,7 @@ public class BranchSwitcherWindow : Window
             if (ImGui.Button("Pick"))
             {
                 Pick();
+                this.IsOpen = false;
             }
 
             ImGui.SameLine();