diff --git a/DD2Switcher/Program.cs b/DD2Switcher/Program.cs
index 1d2d8ec..8b22a8d 100644
--- a/DD2Switcher/Program.cs
+++ b/DD2Switcher/Program.cs
@@ -139,6 +139,7 @@ internal static class Program {
 		index = (index - 1) % NumProc;
 		if (index < 0) index = NumProc - 1;
 		if (index >= NumProc) return;
+		CleanWindows();
 		Console.WriteLine($"Swapping window at index {index}");
 		var process = GetForegroundProcess();
 		if (process == null) return;
@@ -178,6 +179,7 @@ internal static class Program {
 		index = (index - 1) % NumProc;
 		if (index < 0) index = NumProc - 1;
 		if (index >= NumProc) return;
+		CleanWindows();
 		Console.WriteLine($"Tab to window at index {index}");
 
 		var window = windows[index];