2 files changed, 4 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 7d24279..299a5b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
  (Format: Year/Month/Day)
 Changes for 1.0rc3:
 *07/01/05:
+   * Don't change focus to a window that doesn't accept focus (Mark)
+     FocusControl.cc
    * Only grab keybindings on screens managed by fluxbox (Mark)
      fluxbox.hh Keys.cc/hh FbTk/KeyUtil.cc/hh
    * Fix locale being applied to the clock. (Simon)
diff --git a/src/FocusControl.cc b/src/FocusControl.cc
index f363f30..e0bb886 100644
--- a/src/FocusControl.cc
+++ b/src/FocusControl.cc
@@ -216,7 +216,8 @@ WinClient *FocusControl::lastFocusedWindow(int workspace) {
     for (; it != it_end; ++it) {
         if ((*it)->fbwindow() &&
             ((((int)(*it)->fbwindow()->workspaceNumber()) == workspace ||
-             (*it)->fbwindow()->isStuck()) && !(*it)->fbwindow()->isIconic()))
+             (*it)->fbwindow()->isStuck()) && (*it)->acceptsFocus() &&
+             !(*it)->fbwindow()->isIconic()))
             return *it;
     }
     return 0;