--- kkbswitch/kkbswitch/singlewindowwatcher.cpp.orig	2008-11-20 11:47:20 +0300
+++ kkbswitch/kkbswitch/singlewindowwatcher.cpp	2008-11-20 12:30:46 +0300
@@ -35,6 +35,9 @@ SingleWindowWatcher::~SingleWindowWatche
 
 void SingleWindowWatcher::windowRemoved(WId id)
 {
+  if (m_active_window.key() == id) {
+      m_active_window = m_window_map.end();
+  }
   m_window_map.remove(id);
 }