diff --git a/simpleswitcher.c b/simpleswitcher.c
index 61b6ff18..de93c308 100644
--- a/simpleswitcher.c
+++ b/simpleswitcher.c
@@ -719,6 +719,8 @@ void run_switcher(int mode, int fmode)
 		for (i = nwins-1; i > -1; i--)
 		{
 			if ((c = window_client(wins[i]))
+				&& c->xattr.map_state == IsViewable
+				&& !c->xattr.override_redirect
 				&& !client_has_state(c, netatoms[_NET_WM_STATE_SKIP_PAGER])
 				&& !client_has_state(c, netatoms[_NET_WM_STATE_SKIP_TASKBAR]))
 			{
@@ -948,4 +950,4 @@ int main(int argc, char *argv[])
 		if (ev.type == KeyPress) handle_keypress(&ev);
 	}
 	return EXIT_SUCCESS;
-}
\ No newline at end of file
+}