2 files changed, 3 insertions, 2 deletions

diff --git a/src/FocusControl.hh b/src/FocusControl.hh
index 0d9cd05..65363dd 100644
--- a/src/FocusControl.hh
+++ b/src/FocusControl.hh
@@ -82,6 +82,7 @@ public:
     void dirFocus(FluxboxWindow &win, FocusDir dir);
     bool isMouseFocus() const { return focusModel() == MOUSEFOCUS; }
     bool isMouseTabFocus() const { return tabFocusModel() == MOUSETABFOCUS; }
+    bool isCycling() const { return m_cycling_focus; }
     void addFocusFront(WinClient &client);
     void addFocusBack(WinClient &client);
 
diff --git a/src/Window.cc b/src/Window.cc
index e766cab..4ced1c6 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -2662,7 +2662,7 @@ void FluxboxWindow::buttonPressEvent(XButtonEvent &be) {
     frame().buttonPressEvent(be);
 
     if (be.button == 1 || (be.button == 3 && be.state == Mod1Mask)) {
-        if ((! focused) && (! screen().focusControl().isMouseFocus())) { //check focus
+        if ( (! focused) ) { //check focus
             setInputFocus();
         }
 
@@ -3024,7 +3024,7 @@ void FluxboxWindow::enterNotifyEvent(XCrossingEvent &ev) {
             sa.enter = sa.leave = False;
             XCheckIfEvent(display, &dummy, queueScanner, (char *) &sa);
 
-            if ((!sa.leave || sa.inferior)) {
+            if ((!sa.leave || sa.inferior) && !screen().focusControl().isCycling() ) {
                 setInputFocus();
             }
         }