diff --git a/source/winInputHook.py b/source/winInputHook.py
index 9cecc75302c..abd8f8cd236 100755
--- a/source/winInputHook.py
+++ b/source/winInputHook.py
@@ -10,6 +10,7 @@
 from ctypes import *
 from ctypes.wintypes import *
 from win32con import WM_QUIT, HC_ACTION, WH_KEYBOARD_LL, LLKHF_UP, LLKHF_EXTENDED, LLKHF_INJECTED, WH_MOUSE_LL, LLMHF_INJECTED
+import watchdog
 
 class KBDLLHOOKSTRUCT(Structure):
 	_fields_=[
@@ -35,7 +36,7 @@ class MSLLHOOKSTRUCT(Structure):
 
 @WINFUNCTYPE(c_long,c_int,WPARAM,LPARAM)
 def keyboardHook(code,wParam,lParam):
-	if code!=HC_ACTION:
+	if watchdog.isAttemptingRecovery or code!=HC_ACTION:
 		return windll.user32.CallNextHookEx(0,code,wParam,lParam)
 	kbd=KBDLLHOOKSTRUCT.from_address(lParam)
 	if keyUpCallback and kbd.flags&LLKHF_UP:
@@ -48,7 +49,7 @@ def keyboardHook(code,wParam,lParam):
 
 @WINFUNCTYPE(c_long,c_int,WPARAM,LPARAM)
 def mouseHook(code,wParam,lParam):
-	if code!=HC_ACTION:
+	if watchdog.isAttemptingRecovery or code!=HC_ACTION:
 		return windll.user32.CallNextHookEx(0,code,wParam,lParam)
 	msll=MSLLHOOKSTRUCT.from_address(lParam)
 	if mouseCallback:
diff --git a/user_docs/en/changes.t2t b/user_docs/en/changes.t2t
index f6983c6275d..fb230ae37ea 100644
--- a/user_docs/en/changes.t2t
+++ b/user_docs/en/changes.t2t
@@ -45,6 +45,7 @@ What's New in NVDA
 - Fixed table navigation in threaded view in Mozilla Thunderbird. (#8396)
 - In Mozilla Firefox and Google Chrome, switching to focus mode now works correctly for certain list boxes and trees (where the list box/tree is not itself focusable but its items are) . (#3573, #9157)
 - Browse mode is now correctly turned on by default when reading messages in Outlook 2016/365 if using NVDA's experimental UI Automation support for Word Documents. (#9188)
+- NVDA is now less likely to freeze in such a way that the only way to escape is signing out from your current windows session. (#6291)
 
 
 == Changes for Developers ==