diff --git a/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml b/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml
index 05c68615eb..28b55f987f 100644
--- a/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml
+++ b/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml
@@ -6,14 +6,15 @@
             <cc:PlayerListControl Access="Public" Name="ChannelSelector" HorizontalExpand="True" SizeFlagsStretchRatio="1" />
             <BoxContainer Orientation="Vertical" HorizontalExpand="True" SizeFlagsStretchRatio="2">
                 <BoxContainer Access="Public" Name="BwoinkArea" VerticalExpand="True" />
-                <BoxContainer Orientation="Horizontal" HorizontalAlignment="Right">
-                    <Button Margin="0 0 10 0" Visible="True" Name="PopOut" Access="Public" Text="{Loc 'admin-logs-pop-out'}"/>
-                    <Button Visible="False" Name="Bans" Text="{Loc 'admin-player-actions-bans'}" />
-                    <Button Visible="False" Name="Notes" Text="{Loc 'admin-player-actions-notes'}" />
-                    <Button Visible="False" Name="Kick" Text="{Loc 'admin-player-actions-kick'}" />
-                    <Button Visible="False" Name="Ban" Text="{Loc 'admin-player-actions-ban'}" />
-                    <Button Visible="False" Name="Respawn" Text="{Loc 'admin-player-actions-respawn'}" />
-                    <Button Visible="False" Name="Teleport" Text="{Loc 'admin-player-actions-teleport'}" />
+                <BoxContainer Orientation="Horizontal" HorizontalExpand="True">
+                    <Button Visible="True" Name="PopOut" Access="Public" Text="{Loc 'admin-logs-pop-out'}" StyleClasses="OpenBoth" HorizontalAlignment="Left" />
+                    <Control HorizontalExpand="True" />
+                    <Button Visible="False" Name="Bans" Text="{Loc 'admin-player-actions-bans'}" StyleClasses="OpenRight" />
+                    <Button Visible="False" Name="Notes" Text="{Loc 'admin-player-actions-notes'}" StyleClasses="OpenBoth" />
+                    <Button Visible="False" Name="Kick" Text="{Loc 'admin-player-actions-kick'}" StyleClasses="OpenBoth" />
+                    <Button Visible="False" Name="Ban" Text="{Loc 'admin-player-actions-ban'}" StyleClasses="OpenBoth" />
+                    <Button Visible="False" Name="Respawn" Text="{Loc 'admin-player-actions-respawn'}" StyleClasses="OpenBoth" />
+                    <Button Visible="False" Name="Teleport" Text="{Loc 'admin-player-actions-teleport'}" StyleClasses="OpenLeft" />
                 </BoxContainer>
             </BoxContainer>
         </SplitContainer>
diff --git a/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs b/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs
index 6d8bb78106..bcac6c00d5 100644
--- a/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs
+++ b/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs
@@ -39,17 +39,13 @@ namespace Content.Client.Administration.UI.Bwoink
 
             AHelpHelper = helper;
 
-            _adminManager.AdminStatusUpdated += FixButtons;
-            FixButtons();
+            _adminManager.AdminStatusUpdated += UpdateButtons;
+            UpdateButtons();
 
             ChannelSelector.OnSelectionChanged += sel =>
             {
                 _currentPlayer = sel;
-                if (sel is not null)
-                {
-                    SwitchToChannel(sel.SessionId);
-                }
-
+                SwitchToChannel(sel?.SessionId);
                 ChannelSelector.PlayerListContainer.DirtyList();
             };
 
@@ -182,25 +178,27 @@ namespace Content.Client.Administration.UI.Bwoink
             ChannelSelector.PlayerListContainer.Select(data);
         }
 
-        private void FixButtons()
+        public void UpdateButtons()
         {
+            var disabled = _currentPlayer == null;
+
             Bans.Visible = _adminManager.HasFlag(AdminFlags.Ban);
-            Bans.Disabled = !Bans.Visible;
+            Bans.Disabled = !Bans.Visible || disabled;
 
             Notes.Visible = _adminManager.HasFlag(AdminFlags.ViewNotes);
-            Notes.Disabled = !Notes.Visible;
+            Notes.Disabled = !Notes.Visible || disabled;
 
             Ban.Visible = _adminManager.HasFlag(AdminFlags.Ban);
-            Ban.Disabled = !Ban.Visible;
+            Ban.Disabled = !Ban.Visible || disabled;
 
             Kick.Visible = _adminManager.CanCommand("kick");
-            Kick.Disabled = !Kick.Visible;
-
-            Teleport.Visible = _adminManager.CanCommand("tpto");
-            Teleport.Disabled = !Teleport.Visible;
+            Kick.Disabled = !Kick.Visible || disabled;
 
             Respawn.Visible = _adminManager.CanCommand("respawn");
-            Respawn.Disabled = !Respawn.Visible;
+            Respawn.Disabled = !Respawn.Visible || disabled;
+
+            Teleport.Visible = _adminManager.CanCommand("tpto");
+            Teleport.Disabled = !Teleport.Visible || disabled;
         }
 
         private string FormatTabTitle(ItemList.Item li, PlayerInfo? pl = default)
@@ -231,12 +229,21 @@ namespace Content.Client.Administration.UI.Bwoink
             return sb.ToString();
         }
 
-        private void SwitchToChannel(NetUserId ch)
+        private void SwitchToChannel(NetUserId? ch)
         {
-            foreach (var bw in BwoinkArea.Children)
-                bw.Visible = false;
-            var panel = AHelpHelper.EnsurePanel(ch);
-            panel.Visible = true;
+            UpdateButtons();
+
+            if (ch != null)
+            {
+                var panel = AHelpHelper.EnsurePanel(ch.Value);
+                panel.Visible = true;
+            }
+        }
+
+        public void PopulateList()
+        {
+            ChannelSelector.PopulateList();
+            UpdateButtons();
         }
     }
 }
diff --git a/Content.Client/Administration/UI/Bwoink/BwoinkWindow.xaml.cs b/Content.Client/Administration/UI/Bwoink/BwoinkWindow.xaml.cs
index 58217052b4..984d8c5b1a 100644
--- a/Content.Client/Administration/UI/Bwoink/BwoinkWindow.xaml.cs
+++ b/Content.Client/Administration/UI/Bwoink/BwoinkWindow.xaml.cs
@@ -1,20 +1,6 @@
-using System.Text;
-using System.Threading;
-using Content.Client.Administration.Managers;
-using Content.Client.Administration.UI.CustomControls;
-using Content.Client.Administration.UI.Tabs.AdminTab;
-using Content.Client.Stylesheets;
-using Content.Client.UserInterface.Systems.Bwoink;
-using Content.Shared.Administration;
 using Robust.Client.AutoGenerated;
-using Robust.Client.Console;
-using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
-using Robust.Shared.Network;
-using Robust.Shared.Utility;
-using Timer = Robust.Shared.Timing.Timer;
 
 namespace Content.Client.Administration.UI.Bwoink
 {
@@ -36,7 +22,7 @@ namespace Content.Client.Administration.UI.Bwoink
                 }
             };
 
-            OnOpen += () => Bwoink.ChannelSelector.PopulateList();
+            OnOpen += () => Bwoink.PopulateList();
         }
     }
 }