Index: window.h
===================================================================
RCS file: /cvs/gnome/metacity/src/window.h,v
retrieving revision 1.78
diff -u -p -r1.78 window.h
--- window.h	1 Dec 2002 03:58:04 -0000	1.78
+++ window.h	6 Dec 2002 01:08:18 -0000
@@ -408,7 +408,7 @@ gboolean meta_window_same_application (M
                                        MetaWindow *other_window);
 
 #define META_WINDOW_IN_NORMAL_TAB_CHAIN(w) \
-  ((w)->type != META_WINDOW_DOCK && (w)->type != META_WINDOW_DESKTOP)
+  (((w)->input || (w)->take_focus) && (w)->type != META_WINDOW_DOCK && (w)->type != META_WINDOW_DESKTOP)
 
 #define META_WINDOW_IN_DOCK_TAB_CHAIN(w) \
   (! META_WINDOW_IN_NORMAL_TAB_CHAIN (w))
