2 files changed, 4 insertions, 3 deletions

diff --git a/src/FocusControl.cc b/src/FocusControl.cc
index 48ae36f..6f919ef 100644
--- a/src/FocusControl.cc
+++ b/src/FocusControl.cc
@@ -86,7 +86,8 @@ void FocusControl::cycleFocus(int opts, bool cycle_reverse) {
 
     FocusedWindows *window_list = (opts & CYCLELINEAR) ? &m_creation_order_list : &m_focused_list;
     if (!m_cycling_focus) {
-        m_cycling_focus = true;
+        if (Fluxbox::instance()->watchingScreen())
+            m_cycling_focus = true;
         if (opts & CYCLELINEAR) {
             m_cycling_creation_order = true;
             m_cycling_window = find(window_list->begin(),window_list->end(),s_focused_window);
diff --git a/src/WorkspaceCmd.cc b/src/WorkspaceCmd.cc
index 3bd79c5..c3dd402 100644
--- a/src/WorkspaceCmd.cc
+++ b/src/WorkspaceCmd.cc
@@ -60,7 +60,7 @@ void NextWindowCmd::execute() {
                 screen->focusControl().nextFocus(m_option);
             }
         } else
-            screen->focusControl().nextFocus(m_option);
+            screen->focusControl().nextFocus(m_option | FocusControl::CYCLELINEAR);
     }
 }
 
@@ -82,7 +82,7 @@ void PrevWindowCmd::execute() {
                 screen->focusControl().prevFocus(m_option);
             }
         } else
-            screen->focusControl().nextFocus(m_option);
+            screen->focusControl().nextFocus(m_option | FocusControl::CYCLELINEAR);
     }
 }