diff --git a/src/fe-text/mainwindows.c b/src/fe-text/mainwindows.c
index 711daf0a..fae7ced8 100644
--- a/src/fe-text/mainwindows.c
+++ b/src/fe-text/mainwindows.c
@@ -1642,9 +1642,9 @@ static int window_refnum_left(int refnum, int wrap)
 			break;
 
 		window = window_find_refnum(refnum);
-	} while (!WINDOW_STICKY_MATCH(window, find_sticky));
+	} while (!WINDOW_STICKY_MATCH(window, find_sticky) || is_window_visible(window));
 
-        return refnum;
+	return refnum;
 }
 
 static int window_refnum_right(int refnum, int wrap)
@@ -1664,9 +1664,9 @@ static int window_refnum_right(int refnum, int wrap)
 			break;
 
 		window = window_find_refnum(refnum);
-	} while (!WINDOW_STICKY_MATCH(window, find_sticky));
+	} while (!WINDOW_STICKY_MATCH(window, find_sticky) || is_window_visible(window));
 
-        return refnum;
+	return refnum;
 }
 
 /* SYNTAX: WINDOW LEFT [-directional] */