diff --git a/GlazeWM.Domain/Containers/CommandHandlers/SyncNativeFocusHandler.cs b/GlazeWM.Domain/Containers/CommandHandlers/SyncNativeFocusHandler.cs
index 0b6685666..8f8592b35 100644
--- a/GlazeWM.Domain/Containers/CommandHandlers/SyncNativeFocusHandler.cs
+++ b/GlazeWM.Domain/Containers/CommandHandlers/SyncNativeFocusHandler.cs
@@ -44,6 +44,8 @@ public CommandResponse Handle(SyncNativeFocusCommand command)
       _bus.Emit(new NativeFocusSyncedEvent(focusedContainer));
       _bus.Emit(new FocusChangedEvent(focusedContainer));
 
+      _containerService.HasPendingFocusSync = false;
+
       return CommandResponse.Ok;
     }
   }
diff --git a/GlazeWM.Domain/Containers/ContainerService.cs b/GlazeWM.Domain/Containers/ContainerService.cs
index ef87a552d..4a6c6a877 100644
--- a/GlazeWM.Domain/Containers/ContainerService.cs
+++ b/GlazeWM.Domain/Containers/ContainerService.cs
@@ -39,12 +39,6 @@ public class ContainerService
     public FocusMode FocusMode => FocusedContainer is FloatingWindow ?
       FocusMode.Floating : FocusMode.Tiling;
 
-    /// <summary>
-    /// While active, any this container overrides the target container to set focus to on the next
-    /// focus window event (ie. `EVENT_SYSTEM_FOREGROUND`).
-    /// </summary>
-    public Countdown FocusOverrideCountdown { get; set; } = new(TimeSpan.FromMilliseconds(100));
-
     /// <summary>
     /// Name of the currently active binding mode (if one is active).
     /// </summary>
diff --git a/GlazeWM.Domain/Windows/CommandHandlers/UnmanageWindowHandler.cs b/GlazeWM.Domain/Windows/CommandHandlers/UnmanageWindowHandler.cs
index e56a9ea12..a78b0e0a0 100644
--- a/GlazeWM.Domain/Windows/CommandHandlers/UnmanageWindowHandler.cs
+++ b/GlazeWM.Domain/Windows/CommandHandlers/UnmanageWindowHandler.cs
@@ -10,11 +10,16 @@ internal sealed class UnmanageWindowHandler : ICommandHandler<UnmanageWindowComm
   {
     private readonly Bus _bus;
     private readonly ContainerService _containerService;
+    private readonly WindowService _windowService;
 
-    public UnmanageWindowHandler(Bus bus, ContainerService containerService)
+    public UnmanageWindowHandler(
+      Bus bus,
+      ContainerService containerService,
+      WindowService windowService)
     {
       _bus = bus;
       _containerService = containerService;
+      _windowService = windowService;
     }
 
     public CommandResponse Handle(UnmanageWindowCommand command)
diff --git a/GlazeWM.Domain/Windows/EventHandlers/WindowFocusedHandler.cs b/GlazeWM.Domain/Windows/EventHandlers/WindowFocusedHandler.cs
index 80ee95586..a15306d5f 100644
--- a/GlazeWM.Domain/Windows/EventHandlers/WindowFocusedHandler.cs
+++ b/GlazeWM.Domain/Windows/EventHandlers/WindowFocusedHandler.cs
@@ -51,6 +51,7 @@ public void Handle(WindowFocusedEvent @event)
 
       if (unmanagedStopwatch?.ElapsedMilliseconds < 100)
       {
+        _logger.LogDebug("Overriding native focus.");
         _bus.Invoke(new SyncNativeFocusCommand());
         return;
       }
diff --git a/GlazeWM.Domain/Windows/EventHandlers/WindowMinimizedHandler.cs b/GlazeWM.Domain/Windows/EventHandlers/WindowMinimizedHandler.cs
index 848083e2f..508f78f15 100644
--- a/GlazeWM.Domain/Windows/EventHandlers/WindowMinimizedHandler.cs
+++ b/GlazeWM.Domain/Windows/EventHandlers/WindowMinimizedHandler.cs
@@ -67,7 +67,7 @@ public void Handle(WindowMinimizedEvent @event)
       // Focus should be reassigned to appropriate container.
       if (focusTarget is not null)
       {
-        _bus.Invoke(new SetFocusedDescendant(focusTarget));
+        _bus.Invoke(new SetFocusedDescendantCommand(focusTarget));
         _containerService.HasPendingFocusSync = true;
         _windowService.UnmanagedOrMinimizedStopwatch.Restart();
       }
diff --git a/GlazeWM.Infrastructure/Utils/Countdown.cs b/GlazeWM.Infrastructure/Utils/Countdown.cs
deleted file mode 100644
index 452e442b0..000000000
--- a/GlazeWM.Infrastructure/Utils/Countdown.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace GlazeWM.Infrastructure.Utils
-{
-  public class Countdown
-  {
-    public TimeSpan _timeSpan { get; init; }
-    private DateTime _startTime { get; set; }
-
-    public Countdown(TimeSpan timeSpan)
-    {
-      _timeSpan = timeSpan;
-    }
-
-    public void Start()
-    {
-      _startTime = DateTime.Now;
-    }
-
-    public bool HasElapsed()
-    {
-      return (DateTime.Now - _startTime).TotalMilliseconds > _timeSpan.Milliseconds;
-    }
-  }
-}