diff --git a/src/ui/main-window/ThumbnailsView.swift b/src/ui/main-window/ThumbnailsView.swift
index 52af767d..ab24b4fd 100644
--- a/src/ui/main-window/ThumbnailsView.swift
+++ b/src/ui/main-window/ThumbnailsView.swift
@@ -225,6 +225,9 @@ class ThumbnailsView: NSVisualEffectView {
 
     private func highlightStartView() {
         ThumbnailsView.highlight(Windows.focusedWindowIndex)
+        if let hoveredWindowIndex = Windows.hoveredWindowIndex {
+            ThumbnailsView.highlight(hoveredWindowIndex)
+        }
     }
 
     private func shiftRow(_ maxX: CGFloat, _ rowWidth: CGFloat, _ rowStartIndex: Int, _ index: Int) {