2 files changed, 5 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index d9fb470..9477dc5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
  (Format: Year/Month/Day)
 Changes for 1.0rc3:
 *06/08/03:
+   * Don't raise a window after cycling if it has been minimized (Mark)
+     FocusControl.cc
    * Added support for negative arguments to the `Tab' key command to count
      backwards from the last tab in the group (Mark)
      CurrentWindowCmd.cc
diff --git a/src/FocusControl.cc b/src/FocusControl.cc
index 03f1dc5..dafad30 100644
--- a/src/FocusControl.cc
+++ b/src/FocusControl.cc
@@ -163,7 +163,9 @@ void FocusControl::stopCyclingFocus() {
     // in which case we'll do a proper revert focus
     if (m_cycling_creation_order && m_cycling_window != m_creation_order_list.end())
         m_cycling_window = find(m_focused_list.begin(),m_focused_list.end(),*m_cycling_window);
-    if (m_cycling_window != m_focused_list.end() && m_cycling_window != m_creation_order_list.end()) {
+    if (m_cycling_window != m_focused_list.end() &&
+        m_cycling_window != m_creation_order_list.end() &&
+        (*m_cycling_window)->fbwindow()->isVisible()) {
         WinClient *client = *m_cycling_window;
         m_focused_list.erase(m_cycling_window);
         m_focused_list.push_front(client);