1 files changed, 2 insertions, 1 deletions

diff --git a/src/FocusControl.cc b/src/FocusControl.cc
index e653e22..71b289b 100644
--- a/src/FocusControl.cc
+++ b/src/FocusControl.cc
@@ -291,7 +291,8 @@ Focusable *FocusControl::lastFocusedWindow(int workspace) {
  * Stuck, iconic etc don't matter within a group
  */
 WinClient *FocusControl::lastFocusedWindow(FluxboxWindow &group, WinClient *ignore_client) {
-    if (m_focused_list.empty()) return 0;
+    if (m_focused_list.empty() || m_screen.isShuttingdown())
+        return 0;
 
     Focusables::iterator it = m_focused_list.begin();    
     Focusables::iterator it_end = m_focused_list.end();