diff --git a/src/action.c b/src/action.c
index 34435e02..b2d9d1cf 100644
--- a/src/action.c
+++ b/src/action.c
@@ -1143,6 +1143,12 @@ run_action(struct view *view, struct action *action,
 			cycle_step(dir);
 		} else {
 			cycle_begin(dir, filter);
+			if (!rc.window_switcher.osd.show) {
+				cycle_finish(true);
+				if (view && dir == LAB_CYCLE_DIR_FORWARD) {
+					view_move_to_back(view);
+				}
+			}
 		}
 		break;
 	}