diff --git a/QuickLook.Common b/QuickLook.Common
index a5abd8a..7b4e2fd 160000
--- a/QuickLook.Common
+++ b/QuickLook.Common
@@ -1 +1 @@
-Subproject commit a5abd8a69197f620ca0cba35ec0d14550e00e837
+Subproject commit 7b4e2fd3a01370bf2e98715b4e3ced3d2671f449
diff --git a/QuickLook/ViewWindowManager.cs b/QuickLook/ViewWindowManager.cs
index 20a40df..8e09214 100644
--- a/QuickLook/ViewWindowManager.cs
+++ b/QuickLook/ViewWindowManager.cs
@@ -171,6 +171,8 @@ namespace QuickLook
             _viewerWindow = new ViewerWindow();
             _viewerWindow.Closed += (sender, e) =>
             {
+                if (ProcessHelper.IsShuttingDown())
+                    return;
                 if (!(sender is ViewerWindow w) || w.Pinned)
                     return; // Pinned window has already been forgotten
                 StopFocusMonitor();